Commit Graph

8293 Commits

Author SHA1 Message Date
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
Brian Behlendorf 46f868c3c3 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-13 15:03:07 -08:00
Brian Behlendorf 88915a12cb Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-13 15:03:04 -08:00
Brian Behlendorf 89351f06c5 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-13 15:03:02 -08:00
Brian Behlendorf 7669982945 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-13 15:02:59 -08:00
Brian Behlendorf 28d3375587 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-13 15:02:58 -08:00
Brian Behlendorf 3486f62c97 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-13 15:02:57 -08:00
Brian Behlendorf 2bec0659c2 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-13 15:02:51 -08:00
Brian Behlendorf fd1da7d6b9 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 15:02:50 -08:00
Brian Behlendorf 042deede25 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 15:02:49 -08:00
Brian Behlendorf 87b856578c Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-13 15:02:43 -08:00
Brian Behlendorf cb2016c3a0 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-13 15:02:42 -08:00
Brian Behlendorf 3be05f71d6 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-13 15:02:38 -08:00
Brian Behlendorf cdb5cc1040 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-13 15:02:37 -08:00
Brian Behlendorf 4db565cac0 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-13 15:02:34 -08:00
Brian Behlendorf 1aadf87bc3 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-13 15:02:32 -08:00
Brian Behlendorf e7a370db5d Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-13 15:02:29 -08:00
Brian Behlendorf 400ae02345 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-13 15:02:27 -08:00
Brian Behlendorf ccb856b68b Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-13 15:02:24 -08:00
Brian Behlendorf eb142d443a Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-13 15:02:23 -08:00
Brian Behlendorf 92f6c04ce8 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-13 15:02:19 -08:00
Brian Behlendorf eaa540643f Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-13 15:02:18 -08:00
Brian Behlendorf 149c57fd06 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-13 15:02:15 -08:00
Brian Behlendorf acd48f80d9 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-13 15:02:13 -08:00
Brian Behlendorf 60f5ac8ac7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 15:02:12 -08:00