Commit Graph

7863 Commits

Author SHA1 Message Date
Brian Behlendorf d1c00e78f3 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:08 -08:00
Brian Behlendorf 3f364581cd Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 15:11:07 -08:00
Brian Behlendorf 2b195391ee Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 15:11:06 -08:00
Brian Behlendorf ca43e8cb33 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:01 -08:00
Brian Behlendorf aa6c4ff685 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 15:10:59 -08:00
Brian Behlendorf bcafe37b97 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 15:10:59 -08:00
Brian Behlendorf 863a9a7fbd Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-09 15:10:53 -08:00
Brian Behlendorf 8585fdfc59 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-09 15:10:52 -08:00
Brian Behlendorf ef7adc458b Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-09 15:10:49 -08:00
Brian Behlendorf 3396d6d69e Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-09 15:10:47 -08:00
Brian Behlendorf 7c08a51829 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-09 15:10:44 -08:00
Brian Behlendorf 921ebaf7f7 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-09 15:10:43 -08:00
Brian Behlendorf cdfebdafb3 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-09 15:10:40 -08:00
Brian Behlendorf 193dc509d0 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-09 15:10:38 -08:00
Brian Behlendorf 1e0a16bbfd Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-09 15:10:35 -08:00
Brian Behlendorf 17767ebc82 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-09 15:10:34 -08:00
Brian Behlendorf 056f7e7663 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-09 15:10:31 -08:00
Brian Behlendorf 668b10d1e8 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-09 15:10:29 -08:00
Brian Behlendorf 522fb18428 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 15:10:26 -08:00
Brian Behlendorf 18c7d89c62 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-09 15:10:25 -08:00
Brian Behlendorf 6791a1ee34 I don't think we need this in userspace 2009-01-09 15:07:32 -08:00
Brian Behlendorf bed94035fd Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-09 14:46:42 -08:00
Brian Behlendorf a7e5f34acb Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-09 14:46:41 -08:00
Brian Behlendorf ded1ca7691 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-09 14:46:38 -08:00
Brian Behlendorf ae80ba7fda Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-09 14:46:36 -08:00
Brian Behlendorf cafd35d37e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-09 14:46:33 -08:00
Brian Behlendorf 7af644b8b3 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-09 14:46:32 -08:00
Brian Behlendorf 482148aebf Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-09 14:46:29 -08:00
Brian Behlendorf 7ea7020636 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-09 14:46:27 -08:00
Brian Behlendorf c968380bef Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-09 14:46:24 -08:00
Brian Behlendorf ca0b39e0e7 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-09 14:46:23 -08:00
Brian Behlendorf 85732ebfeb Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-09 14:46:20 -08:00
Brian Behlendorf 7767aca8a1 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-09 14:46:19 -08:00
Brian Behlendorf b5e2865c47 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-09 14:46:16 -08:00
Brian Behlendorf fd07f08222 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-09 14:46:14 -08:00
Brian Behlendorf 95201e8072 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-09 14:46:11 -08:00
Brian Behlendorf 0f48a52f65 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 14:46:10 -08:00
Brian Behlendorf 1d7a3a827c Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-09 14:46:07 -08:00
Brian Behlendorf d7e52cccea Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-09 14:46:05 -08:00
Brian Behlendorf fb107cce4c Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-09 14:46:02 -08:00
Brian Behlendorf d584ad239d Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-09 14:46:01 -08:00
Brian Behlendorf 0ccbba636e Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-09 14:45:58 -08:00
Brian Behlendorf 4022f85bac Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 14:45:56 -08:00
Brian Behlendorf 3485e5a403 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-09 14:45:53 -08:00
Brian Behlendorf c766077d8c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 14:45:52 -08:00
Brian Behlendorf 3f48c3fcd5 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 14:45:52 -08:00
Brian Behlendorf 6ccc5384e3 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 14:45:47 -08:00
Brian Behlendorf be3a17e437 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 14:45:45 -08:00
Brian Behlendorf 764c8c5940 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 14:45:45 -08:00
Brian Behlendorf 09ff257520 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-09 14:45:39 -08:00