Commit Graph

14280 Commits

Author SHA1 Message Date
Brian Behlendorf
99029c5fdc Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-01 14:42:27 -07:00
Brian Behlendorf
d0c6b95287 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-01 14:42:26 -07:00
Brian Behlendorf
82eec484b1 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-01 14:42:21 -07:00
Brian Behlendorf
0bab8365f2 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-01 14:42:19 -07:00
Brian Behlendorf
fb84299ffe Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-01 14:42:14 -07:00
Brian Behlendorf
b96e995acd Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-01 14:42:13 -07:00
Brian Behlendorf
33bc719eb7 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-01 14:42:07 -07:00
Brian Behlendorf
a80902b8ba Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-01 14:42:06 -07:00
Brian Behlendorf
4a642c0301 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-01 14:42:00 -07:00
Brian Behlendorf
e01c740ef0 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-01 14:41:59 -07:00
Brian Behlendorf
82a0f70fa7 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-01 14:41:53 -07:00
Brian Behlendorf
96a3016216 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-01 14:41:52 -07:00
Brian Behlendorf
d393941625 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-01 14:41:47 -07:00
Brian Behlendorf
f8a752ed10 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-01 14:41:45 -07:00
Brian Behlendorf
92ecb2ee16 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-01 14:41:40 -07:00
Brian Behlendorf
6e84ba1bb7 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-01 14:41:38 -07:00
Brian Behlendorf
c4f49bfe08 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-01 14:41:33 -07:00
Brian Behlendorf
4106da9590 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-01 14:41:31 -07:00
Brian Behlendorf
ad9cd1fec8 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-01 14:41:26 -07:00
Brian Behlendorf
679cf84a0a Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-01 14:41:24 -07:00
Brian Behlendorf
0a618fa2cd Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-01 14:41:19 -07:00
Brian Behlendorf
c3526da6a3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-01 14:41:18 -07:00
Brian Behlendorf
4b9cfd8ceb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-01 14:41:17 -07:00
Brian Behlendorf
1bc38d2a47 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-01 14:41:08 -07:00
Brian Behlendorf
32a2dd0245 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-01 14:41:06 -07:00
Brian Behlendorf
cea83abd84 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-01 14:41:06 -07:00
Brian Behlendorf
551e14627a Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-01 14:40:56 -07:00
Brian Behlendorf
a47e317745 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-07-01 14:40:55 -07:00
Brian Behlendorf
c5ef085e65 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-01 14:40:50 -07:00
Brian Behlendorf
bf57ea9943 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-01 14:40:48 -07:00
Brian Behlendorf
5040ca0465 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-01 14:40:43 -07:00
Brian Behlendorf
e3f18d724a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-01 14:40:41 -07:00
Brian Behlendorf
9f7ebe68b8 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-01 14:40:36 -07:00
Brian Behlendorf
0fd4be9ebb Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-01 14:40:34 -07:00
Brian Behlendorf
555d4e9f14 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-01 14:40:29 -07:00
Brian Behlendorf
e8653721f0 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-01 14:40:27 -07:00
Brian Behlendorf
ff22d09ad7 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-01 14:40:21 -07:00
Brian Behlendorf
991c35bdf8 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-01 14:40:19 -07:00
Brian Behlendorf
c5e902ec33 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-01 14:40:13 -07:00
Brian Behlendorf
40f0b870a9 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-01 14:40:11 -07:00
Brian Behlendorf
6e50f53cb1 Drop --with-linux and --with-spl options from user build. 2009-07-01 14:35:38 -07:00
Brian Behlendorf
1b223984fa Merge commit 'refs/top-bases/top' into top 2009-07-01 13:21:26 -07:00
Brian Behlendorf
c9b43a89d4 Refresh autogen products 2009-07-01 13:19:59 -07:00
Brian Behlendorf
2fca42d93f Merge commit 'refs/top-bases/top' into top 2009-07-01 12:57:57 -07:00
Brian Behlendorf
4ab0ee76c1 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-01 12:57:56 -07:00
Brian Behlendorf
0e19b410cd Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-07-01 12:57:54 -07:00
Brian Behlendorf
e0134d1f30 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-01 12:57:53 -07:00
Brian Behlendorf
e23df6a9a1 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-01 12:57:51 -07:00
Brian Behlendorf
89bb949dfd Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-01 12:57:46 -07:00
Brian Behlendorf
b4a4ebf6f7 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-01 12:57:44 -07:00