Brian Behlendorf
|
f43a3baf0e
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-05 15:44:50 -08:00 |
|
Brian Behlendorf
|
132e3e89ae
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:44:48 -08:00 |
|
Brian Behlendorf
|
bca6b89acf
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-05 15:44:46 -08:00 |
|
Brian Behlendorf
|
57c442fb0e
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:44:43 -08:00 |
|
Brian Behlendorf
|
037a076160
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-05 15:44:42 -08:00 |
|
Brian Behlendorf
|
8dc38960d2
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:44:39 -08:00 |
|
Brian Behlendorf
|
3ca22288d8
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-05 15:44:38 -08:00 |
|
Brian Behlendorf
|
4b9683dcf7
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:44:35 -08:00 |
|
Brian Behlendorf
|
7c992011a1
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 15:44:33 -08:00 |
|
Brian Behlendorf
|
760d78b9f8
|
Move default include paths after custom include paths so local stuff gets picked up first
|
2009-01-05 15:42:56 -08:00 |
|
Brian Behlendorf
|
4c741b2f9d
|
Revert changes and resolve include issue by adjusting include path ordering
|
2009-01-05 15:40:56 -08:00 |
|
Brian Behlendorf
|
fa6e8d307a
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-05 15:21:27 -08:00 |
|
Brian Behlendorf
|
822f4cfb77
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-01-05 15:21:26 -08:00 |
|
Brian Behlendorf
|
90a0d01e20
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:21:25 -08:00 |
|
Brian Behlendorf
|
d28280dd17
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 15:21:24 -08:00 |
|
Brian Behlendorf
|
5f64944082
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:21:21 -08:00 |
|
Brian Behlendorf
|
bb4ca885b5
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 15:21:19 -08:00 |
|
Brian Behlendorf
|
5b2b7fc3df
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 15:21:19 -08:00 |
|
Brian Behlendorf
|
96989f8b00
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:21:14 -08:00 |
|
Brian Behlendorf
|
ab0b7157d5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 15:21:12 -08:00 |
|
Brian Behlendorf
|
eb58273a29
|
Update exported symbol names for new traversal code
|
2009-01-05 15:19:35 -08:00 |
|
Brian Behlendorf
|
bf45e9e608
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-05 14:29:31 -08:00 |
|
Brian Behlendorf
|
049c4d2938
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-01-05 14:29:30 -08:00 |
|
Brian Behlendorf
|
eb5b7ed442
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:28 -08:00 |
|
Brian Behlendorf
|
bd81e10fbf
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 14:29:27 -08:00 |
|
Brian Behlendorf
|
b355609c83
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:24 -08:00 |
|
Brian Behlendorf
|
c060e80947
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-05 14:29:23 -08:00 |
|
Brian Behlendorf
|
2d09f5c26a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:20 -08:00 |
|
Brian Behlendorf
|
1ad075a9a8
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-05 14:29:19 -08:00 |
|
Brian Behlendorf
|
097cdb5a93
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:16 -08:00 |
|
Brian Behlendorf
|
e85775aeaa
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 14:29:14 -08:00 |
|
Brian Behlendorf
|
f2e7ecdc88
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:12 -08:00 |
|
Brian Behlendorf
|
2624771e63
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-05 14:29:10 -08:00 |
|
Brian Behlendorf
|
f5d34a8f92
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:07 -08:00 |
|
Brian Behlendorf
|
a198620e23
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 14:29:06 -08:00 |
|
Brian Behlendorf
|
b7e8a2b4cb
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:03 -08:00 |
|
Brian Behlendorf
|
561bf6db3a
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-05 14:29:01 -08:00 |
|
Brian Behlendorf
|
3b9ebf1b19
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:59 -08:00 |
|
Brian Behlendorf
|
c80dcc2dc1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 14:28:57 -08:00 |
|
Brian Behlendorf
|
2596211881
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:54 -08:00 |
|
Brian Behlendorf
|
a1dc943c32
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 14:28:53 -08:00 |
|
Brian Behlendorf
|
6c9fbf3eb8
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:50 -08:00 |
|
Brian Behlendorf
|
c31e0e9e89
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 14:28:49 -08:00 |
|
Brian Behlendorf
|
9546ae3fe8
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:46 -08:00 |
|
Brian Behlendorf
|
48fa5d6c8f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 14:28:44 -08:00 |
|
Brian Behlendorf
|
08fc451940
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:42 -08:00 |
|
Brian Behlendorf
|
74245215c4
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 14:28:40 -08:00 |
|
Brian Behlendorf
|
d1c8781815
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 14:28:39 -08:00 |
|
Brian Behlendorf
|
5edbf98e04
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:35 -08:00 |
|
Brian Behlendorf
|
86a7a82c2d
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 14:28:34 -08:00 |