Commit Graph

8709 Commits

Author SHA1 Message Date
Brian Behlendorf e8d31c1ac1 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-15 10:18:10 -08:00
Brian Behlendorf b04bda7bbe Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-15 10:18:07 -08:00
Brian Behlendorf fc681597a3 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-15 10:18:06 -08:00
Brian Behlendorf 244847000f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-15 10:18:02 -08:00
Brian Behlendorf 62895cf669 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 10:18:00 -08:00
Brian Behlendorf 724d223669 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-15 10:17:57 -08:00
Brian Behlendorf 6678399085 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-15 10:17:55 -08:00
Brian Behlendorf 5b50156d6e Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-15 10:17:52 -08:00
Brian Behlendorf 5e271c53c7 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-15 10:17:50 -08:00
Brian Behlendorf 29e69f4de9 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-15 10:17:47 -08:00
Brian Behlendorf e9b427f443 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-15 10:17:45 -08:00
Brian Behlendorf 213a80ae8c Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-15 10:17:42 -08:00
Brian Behlendorf 407bc94813 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-15 10:17:41 -08:00
Brian Behlendorf 2c9580608a Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-15 10:17:37 -08:00
Brian Behlendorf ec6f146b68 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 10:17:35 -08:00
Brian Behlendorf 820a38529c Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-15 10:17:32 -08:00
Brian Behlendorf 781d01aadc Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-15 10:17:30 -08:00
Brian Behlendorf 9b17c26521 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-15 10:17:27 -08:00
Brian Behlendorf 1833e4a7e8 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-15 10:17:25 -08:00
Brian Behlendorf 8ef708a58a Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-15 10:17:22 -08:00
Brian Behlendorf 33471f3406 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 10:17:20 -08:00
Brian Behlendorf 07d76bbadd Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 10:17:20 -08:00
Brian Behlendorf 73df52d905 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-15 10:17:14 -08:00
Brian Behlendorf df1a262e04 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-15 10:17:13 -08:00
Brian Behlendorf 2e7dccee5f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 10:17:12 -08:00
Brian Behlendorf c345c0eb60 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-15 10:17:06 -08:00
Brian Behlendorf b2683aa5b6 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 10:17:04 -08:00
Brian Behlendorf fe2b7f1ad8 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-15 10:17:01 -08:00
Brian Behlendorf 527dde1a5d Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-15 10:17:00 -08:00
Brian Behlendorf 0b2c68f50c Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-15 10:16:56 -08:00
Brian Behlendorf 1e9c90a149 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-15 10:16:54 -08:00
Brian Behlendorf b984a731a9 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-15 10:16:51 -08:00
Brian Behlendorf 084c63345d Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-15 10:16:49 -08:00
Brian Behlendorf e1de8dbf32 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-15 10:16:46 -08:00
Brian Behlendorf f8a6247e18 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-15 10:16:45 -08:00
Brian Behlendorf 2e907173ad Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-15 10:16:41 -08:00
Brian Behlendorf 855d489dfe Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-15 10:16:39 -08:00
Brian Behlendorf b487be0ca1 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 10:16:36 -08:00
Brian Behlendorf 2a1b818ef7 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 10:16:29 -08:00
Brian Behlendorf 6932f09bb5 Reference module not modules in SPL for consistency 2009-01-15 10:14:21 -08:00
Brian Behlendorf 22f8ca065a Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-01-14 16:05:21 -08:00
Brian Behlendorf 0d8e925476 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-01-14 16:05:17 -08:00
Brian Behlendorf f5780bd385 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-14 16:05:11 -08:00
Brian Behlendorf 37e2d99e39 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-14 16:05:09 -08:00
Brian Behlendorf c1664f35ce Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-14 16:05:04 -08:00
Brian Behlendorf 6b8dd141cf Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-14 16:05:01 -08:00
Brian Behlendorf a83f5a00d0 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-14 16:04:56 -08:00
Brian Behlendorf aac79c5329 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-14 16:04:53 -08:00
Brian Behlendorf 616571aae5 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-14 16:04:46 -08:00
Brian Behlendorf 9339984f08 Resolve conflict 2009-01-14 16:04:33 -08:00