Commit Graph

8167 Commits

Author SHA1 Message Date
Brian Behlendorf 482f4fdc42 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-13 15:08:09 -08:00
Brian Behlendorf de43f9a57c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-13 15:08:08 -08:00
Brian Behlendorf d9a2665db4 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-13 15:08:04 -08:00
Brian Behlendorf c6a5786c2f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-13 15:08:02 -08:00
Brian Behlendorf 9410d25e5b Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-13 15:07:59 -08:00
Brian Behlendorf d851db8193 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-13 15:07:58 -08:00
Brian Behlendorf cd72f68b08 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-13 15:07:54 -08:00
Brian Behlendorf 5691cd6443 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-13 15:07:53 -08:00
Brian Behlendorf f661985075 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-13 15:07:52 -08:00
Brian Behlendorf 79114bd837 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-13 15:07:47 -08:00
Brian Behlendorf 62d5f771e5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 15:07:45 -08:00
Brian Behlendorf 925ed2c7a0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 15:07:44 -08:00
Brian Behlendorf 81a83f84f1 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-13 15:07:39 -08:00
Brian Behlendorf 94f31ea740 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-13 15:07:37 -08:00
Brian Behlendorf ef55fa1786 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-13 15:07:34 -08:00
Brian Behlendorf 34c27b769d Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-13 15:07:33 -08:00
Brian Behlendorf 2dfd9828b9 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-13 15:07:29 -08:00
Brian Behlendorf b7abb7543b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-13 15:07:28 -08:00
Brian Behlendorf f85924c315 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-13 15:07:25 -08:00
Brian Behlendorf fb5fb64a59 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-13 15:07:23 -08:00
Brian Behlendorf cb41b55999 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-13 15:07:20 -08:00
Brian Behlendorf 340e3e78b5 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-13 15:07:18 -08:00
Brian Behlendorf a71d324891 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-13 15:07:15 -08:00
Brian Behlendorf f467abbad5 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-13 15:07:14 -08:00
Brian Behlendorf a93d76eb1b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-13 15:07:11 -08:00
Brian Behlendorf d2eae65894 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-13 15:07:09 -08:00
Brian Behlendorf b14513e826 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 15:07:08 -08:00
Brian Behlendorf 4c31283afc Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 15:07:07 -08:00
Brian Behlendorf cad99cbd51 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-13 15:07:06 -08:00
Brian Behlendorf 2e9cd667d0 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-01-13 15:07:06 -08:00
Brian Behlendorf fcd2296399 Additional rw_lock not being initialized cleaned in updated code 2009-01-13 15:05:02 -08:00
Brian Behlendorf ddad379522 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-13 15:03:52 -08:00
Brian Behlendorf 14f8f1d4bf Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-13 15:03:50 -08:00
Brian Behlendorf 7d747f4f87 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-13 15:03:47 -08:00
Brian Behlendorf 621c89c696 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-13 15:03:45 -08:00
Brian Behlendorf 46244281bd Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-13 15:03:42 -08:00
Brian Behlendorf 887f860aba Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-13 15:03:41 -08:00
Brian Behlendorf e217c22dc2 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-13 15:03:37 -08:00
Brian Behlendorf ff35f88f33 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-13 15:03:36 -08:00
Brian Behlendorf 2ff8e753d8 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-13 15:03:33 -08:00
Brian Behlendorf 51818ba4e2 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-13 15:03:31 -08:00
Brian Behlendorf b46cf7eeff Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-13 15:03:28 -08:00
Brian Behlendorf 642c2b2b4a Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-13 15:03:26 -08:00
Brian Behlendorf 7bf14b47bf Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-13 15:03:23 -08:00
Brian Behlendorf c19b85aec0 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-13 15:03:22 -08:00
Brian Behlendorf 57bc776259 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-13 15:03:18 -08:00
Brian Behlendorf 0231d2bb13 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-13 15:03:17 -08:00
Brian Behlendorf 2c55129439 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-13 15:03:14 -08:00
Brian Behlendorf e095be1cc5 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-13 15:03:12 -08:00
Brian Behlendorf 4c2936a63f Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-13 15:03:09 -08:00