Commit Graph

5402 Commits

Author SHA1 Message Date
Brian Behlendorf a8e7c21ad7 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 11:06:51 -08:00
Brian Behlendorf e95501a744 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-19 11:06:48 -08:00
Brian Behlendorf b2bf7106ed Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 11:06:46 -08:00
Brian Behlendorf 4bccf6b2c8 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-19 11:06:43 -08:00
Brian Behlendorf eeccfec33b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 11:06:42 -08:00
Brian Behlendorf 3556355394 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-19 11:06:39 -08:00
Brian Behlendorf 8de27ace20 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 11:06:38 -08:00
Brian Behlendorf ff51b64fde Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-19 11:06:34 -08:00
Brian Behlendorf d5b0e2f5f8 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 11:06:33 -08:00
Brian Behlendorf f9e908db67 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 11:06:32 -08:00
Brian Behlendorf 9a4b3b10af Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-19 11:06:27 -08:00
Brian Behlendorf f39f71b60c Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 11:06:26 -08:00
Brian Behlendorf e5a6ed971b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 11:06:25 -08:00
Brian Behlendorf e8447519d8 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-19 11:06:19 -08:00
Brian Behlendorf cd8c03b918 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 11:06:18 -08:00
Brian Behlendorf 4583d5c015 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-19 11:06:15 -08:00
Brian Behlendorf e26a5f91fc Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 11:06:14 -08:00
Brian Behlendorf cb83a0f8f0 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-19 11:06:10 -08:00
Brian Behlendorf b2a86857a8 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 11:06:09 -08:00
Brian Behlendorf af2599694f Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-19 11:06:06 -08:00
Brian Behlendorf 15268640a3 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 11:06:05 -08:00
Brian Behlendorf 7930999e3a Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-19 11:06:01 -08:00
Brian Behlendorf d32b761adb Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-19 11:06:00 -08:00
Brian Behlendorf 9feb338f0b Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-19 11:05:57 -08:00
Brian Behlendorf 9bcfd61bd2 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-19 11:05:55 -08:00
Brian Behlendorf e461d277b9 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 11:05:52 -08:00
Brian Behlendorf e3bcaaa2bb Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-19 11:05:50 -08:00
Brian Behlendorf cc92d6497b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf d67cf69e08 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf e8157d65b3 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 11:05:48 -08:00
Brian Behlendorf 893a49fa9a Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 11:05:48 -08:00
Brian Behlendorf 9041f66bad Fix all instances of for (int i;;) {} that were easily found 2008-12-19 11:03:54 -08:00
Brian Behlendorf f7ac4dd06f Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-19 10:51:40 -08:00
Brian Behlendorf 849bcf1672 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 10:51:39 -08:00
Brian Behlendorf 0ecffdf8ef Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 10:51:36 -08:00
Brian Behlendorf f1e9e04d37 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 10:51:35 -08:00
Brian Behlendorf cda8ca1545 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-19 10:51:31 -08:00
Brian Behlendorf 70a97750bc Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 10:51:30 -08:00
Brian Behlendorf 9ac790d80e Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 10:51:27 -08:00
Brian Behlendorf 45191d7904 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 10:51:26 -08:00
Brian Behlendorf 70d2cc3556 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-19 10:51:22 -08:00
Brian Behlendorf 4115212df8 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-19 10:51:21 -08:00
Brian Behlendorf deec07f004 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-19 10:51:18 -08:00
Brian Behlendorf f8bb636453 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 10:51:17 -08:00
Brian Behlendorf e7bc76c3d4 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-19 10:51:14 -08:00
Brian Behlendorf e79a0861ce Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 10:51:12 -08:00
Brian Behlendorf 8ce03bf718 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 10:51:09 -08:00
Brian Behlendorf 0938ee26f9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 10:51:08 -08:00
Brian Behlendorf de6a384c50 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-19 10:51:05 -08:00
Brian Behlendorf 525a682d4d Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 10:51:03 -08:00