Commit Graph

9450 Commits

Author SHA1 Message Date
Brian Behlendorf 960159befd Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-15 16:44:55 -08:00
Brian Behlendorf d33b8a3c8b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-15 16:44:51 -08:00
Brian Behlendorf a90b70bef6 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-15 16:44:43 -08:00
Brian Behlendorf 841a460332 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 16:44:39 -08:00
Brian Behlendorf 6d9483354e Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-15 16:44:32 -08:00
Brian Behlendorf 8d392afc3d Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-15 16:44:29 -08:00
Brian Behlendorf 3a477b5caf Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-15 16:44:22 -08:00
Brian Behlendorf 260a2de91d Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-15 16:44:16 -08:00
Brian Behlendorf 651ff68597 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-15 16:44:10 -08:00
Brian Behlendorf 6dad934d12 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-15 16:44:06 -08:00
Brian Behlendorf 356d53ae99 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-15 16:43:58 -08:00
Brian Behlendorf 0adddbf7af Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-15 16:43:53 -08:00
Brian Behlendorf 58ecd679ee Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-15 16:43:45 -08:00
Brian Behlendorf 6ca0959684 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 16:43:40 -08:00
Brian Behlendorf 5a043046dd Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-15 16:43:33 -08:00
Brian Behlendorf 88d799dcfd Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-15 16:43:28 -08:00
Brian Behlendorf 205df408b5 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-15 16:43:21 -08:00
Brian Behlendorf 2c0bd4fa2d Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-15 16:43:15 -08:00
Brian Behlendorf aad8bc4878 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-15 16:43:08 -08:00
Brian Behlendorf db4999fcde Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 16:43:04 -08:00
Brian Behlendorf b4d292632b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 16:43:02 -08:00
Brian Behlendorf bd851514a8 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-15 16:42:50 -08:00
Brian Behlendorf cd983096ab Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-15 16:42:45 -08:00
Brian Behlendorf 75a0fcf23f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 16:42:43 -08:00
Brian Behlendorf 1c51a91710 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-15 16:42:30 -08:00
Brian Behlendorf d2f58d7ad8 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 16:42:25 -08:00
Brian Behlendorf 614d6d5b20 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-15 16:42:17 -08:00
Brian Behlendorf ad6a14bd14 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-15 16:42:12 -08:00
Brian Behlendorf 63d1e910f4 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-15 16:42:05 -08:00
Brian Behlendorf b8f0a330ce Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-15 16:42:00 -08:00
Brian Behlendorf 2d9a975966 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-15 16:41:52 -08:00
Brian Behlendorf 110d46a001 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-15 16:41:48 -08:00
Brian Behlendorf 2a81e69dbf Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-15 16:41:39 -08:00
Brian Behlendorf 978848c9c3 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-15 16:41:37 -08:00
Brian Behlendorf a4b86fac11 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-15 16:41:29 -08:00
Brian Behlendorf cbab492240 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-15 16:41:25 -08:00
Brian Behlendorf 73e5244f93 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 16:41:17 -08:00
Brian Behlendorf 1f81d9a010 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 16:41:10 -08:00
Brian Behlendorf 2f2120f885 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 16:41:09 -08:00
Brian Behlendorf 498800d66a Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-15 16:41:07 -08:00
Brian Behlendorf e9a0807176 Remove fix-locks dependency this topic branch was accepted upstream and can now be removed 2009-01-15 16:36:11 -08:00
Brian Behlendorf 45efc436d3 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-01-15 16:35:12 -08:00
Brian Behlendorf 1de70ae4f9 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-01-15 16:35:09 -08:00
Brian Behlendorf f592b455fb Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-01-15 16:35:04 -08:00
Brian Behlendorf 3df37a9a92 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-15 16:34:56 -08:00
Brian Behlendorf ef96542acb Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 16:34:51 -08:00
Brian Behlendorf ceac1418ca Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-15 16:34:42 -08:00
Brian Behlendorf 4fcc576d1c Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-15 16:34:38 -08:00
Brian Behlendorf a8b027c6ba Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-15 16:34:30 -08:00
Brian Behlendorf 3db63928d7 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-15 16:34:26 -08:00