Commit Graph

5286 Commits

Author SHA1 Message Date
Brian Behlendorf 6f141c5c74 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-19 12:38:00 -08:00
Brian Behlendorf 42fd478599 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 12:37:57 -08:00
Brian Behlendorf 05204eac0d Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-19 12:37:50 -08:00
Brian Behlendorf 06a62a8a8c Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 12:37:47 -08:00
Brian Behlendorf 584e1eb884 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-19 12:37:41 -08:00
Brian Behlendorf 7738d0c83d Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-19 12:37:38 -08:00
Brian Behlendorf f50d8dd341 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-19 12:37:32 -08:00
Brian Behlendorf fb259dedce Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-19 12:37:29 -08:00
Brian Behlendorf c2d9428f4c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 12:37:22 -08:00
Brian Behlendorf 3d880713d1 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-19 12:37:18 -08:00
Brian Behlendorf 97818e5e2b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 12:37:17 -08:00
Brian Behlendorf 459f1388ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 12:37:15 -08:00
Brian Behlendorf a12ef5400d Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 12:37:14 -08:00
Brian Behlendorf 87810a7c8b Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 12:37:13 -08:00
Brian Behlendorf 93a6c0b0b9 Fix c90 for() issue 2008-12-19 12:33:22 -08:00
Brian Behlendorf 553ed5a642 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 12:22:08 -08:00
Brian Behlendorf 55c0063df6 Add 2 more headers where are missing 2008-12-19 12:18:59 -08:00
Brian Behlendorf 4d27214756 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-19 12:11:21 -08:00
Brian Behlendorf 3c787f200f Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 12:11:19 -08:00
Brian Behlendorf 0b750e64a3 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 12:11:12 -08:00
Brian Behlendorf 87dc99c933 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 12:11:09 -08:00
Brian Behlendorf fe99d889f4 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-19 12:11:02 -08:00
Brian Behlendorf dbdcbdf08c Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 12:11:00 -08:00
Brian Behlendorf b0ee198cad Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 12:10:53 -08:00
Brian Behlendorf ee2e34a7a5 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 12:10:50 -08:00
Brian Behlendorf 670c0cd4b0 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-19 12:10:44 -08:00
Brian Behlendorf 9c7d42abca Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-19 12:10:42 -08:00
Brian Behlendorf e056a89fd9 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-19 12:10:36 -08:00
Brian Behlendorf 6216d4cd8a Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 12:10:34 -08:00
Brian Behlendorf b781abb885 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-19 12:10:27 -08:00
Brian Behlendorf b660663ca7 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 12:10:24 -08:00
Brian Behlendorf b52e9967ee Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 12:10:17 -08:00
Brian Behlendorf 150a4c06f8 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 12:10:15 -08:00
Brian Behlendorf 17c01d7d7a Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-19 12:10:09 -08:00
Brian Behlendorf eb4c53562b Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 12:10:06 -08:00
Brian Behlendorf 17dbc39d1f Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-19 12:09:59 -08:00
Brian Behlendorf fef6be057e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 12:09:57 -08:00
Brian Behlendorf 56a64f0d6d Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-19 12:09:50 -08:00
Brian Behlendorf bb5b627011 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 12:09:48 -08:00
Brian Behlendorf 1076a2ba73 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-19 12:09:41 -08:00
Brian Behlendorf 70b51c9481 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 12:09:39 -08:00
Brian Behlendorf 0610e0e40b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 12:09:37 -08:00
Brian Behlendorf 5badb8066e Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-19 12:09:27 -08:00
Brian Behlendorf f1244c8934 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 12:09:25 -08:00
Brian Behlendorf 8e9ab16b20 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 12:09:23 -08:00
Brian Behlendorf 3b2a632630 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-19 12:09:14 -08:00
Brian Behlendorf f913d1dcea Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 12:09:12 -08:00
Brian Behlendorf 0ca1ee9cb3 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-19 12:09:07 -08:00
Brian Behlendorf 51aa44f39c Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 12:09:04 -08:00
Brian Behlendorf 05eaf1984e Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-19 12:09:00 -08:00