Commit Graph

7047 Commits

Author SHA1 Message Date
Brian Behlendorf a1b23d4bf5 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-22 15:36:16 -08:00
Brian Behlendorf 27dd5bca77 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 15:36:15 -08:00
Brian Behlendorf dfddd3290c Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-22 15:36:14 -08:00
Brian Behlendorf 1f19965f10 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 15:36:14 -08:00
Brian Behlendorf 262c2c49c1 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 15:36:13 -08:00
Brian Behlendorf 088c5451b7 Add missing include 2008-12-22 15:34:18 -08:00
Brian Behlendorf 9b3b373d4f Fix prototypes, why not invalid persay. They use the traditional pre-standard form and were depricated as of C99 2008-12-22 15:33:15 -08:00
Brian Behlendorf 53f2b61ce1 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 15:21:10 -08:00
Brian Behlendorf 89585b82fa Add missing limits 2008-12-22 15:17:57 -08:00
Brian Behlendorf 3251158230 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 15:06:42 -08:00
Brian Behlendorf 091c16c185 Add missing tzfile.h 2008-12-22 15:04:47 -08:00
Brian Behlendorf 314e57ba29 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 14:59:06 -08:00
Brian Behlendorf b0704f1597 Add missing header for ztest 2008-12-22 14:57:15 -08:00
Brian Behlendorf f058190402 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-22 14:54:13 -08:00
Brian Behlendorf b7217f525f Fix typo 2008-12-22 14:52:15 -08:00
Brian Behlendorf acf852f279 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-22 14:45:44 -08:00
Brian Behlendorf 97e7199aaf Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 14:45:43 -08:00
Brian Behlendorf 8916418271 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-22 14:45:40 -08:00
Brian Behlendorf 01dd722b45 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-22 14:45:38 -08:00
Brian Behlendorf 16085fac53 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 14:45:35 -08:00
Brian Behlendorf ef6c136edb Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 14:45:33 -08:00
Brian Behlendorf 04a3608e7c Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-22 14:45:30 -08:00
Brian Behlendorf 8581240944 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 14:45:28 -08:00
Brian Behlendorf 4d59c5d4a5 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 14:45:25 -08:00
Brian Behlendorf fccd2786e1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 14:45:23 -08:00
Brian Behlendorf 84c72b0687 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-22 14:45:20 -08:00
Brian Behlendorf 8ad4fa51a5 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-22 14:45:18 -08:00
Brian Behlendorf 5ae713c680 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-22 14:45:15 -08:00
Brian Behlendorf a9545c30e8 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 14:45:14 -08:00
Brian Behlendorf 3dc0560d62 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-22 14:45:11 -08:00
Brian Behlendorf 86efe1f206 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 14:45:09 -08:00
Brian Behlendorf 5e89e02b78 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 14:45:06 -08:00
Brian Behlendorf 3d29160d4b Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-22 14:45:04 -08:00
Brian Behlendorf d804e3b811 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-22 14:45:01 -08:00
Brian Behlendorf 12573fb5b9 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 14:44:59 -08:00
Brian Behlendorf 775212f404 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-22 14:44:56 -08:00
Brian Behlendorf c267d86b09 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 14:44:55 -08:00
Brian Behlendorf 3bb2cd0f38 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-22 14:44:52 -08:00
Brian Behlendorf 858142b6a0 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 14:44:50 -08:00
Brian Behlendorf 86205f8531 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 14:44:49 -08:00
Brian Behlendorf d997b404df Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-22 14:44:44 -08:00
Brian Behlendorf a4f8b7768b Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 14:44:42 -08:00
Brian Behlendorf 16d3bec487 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 14:44:42 -08:00
Brian Behlendorf de891d3fb2 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-22 14:44:36 -08:00
Brian Behlendorf 5a2aac2caa Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-22 14:44:35 -08:00
Brian Behlendorf e589a181e4 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-22 14:44:31 -08:00
Brian Behlendorf 77ff1773c4 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-22 14:44:30 -08:00
Brian Behlendorf d2762e82d1 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-22 14:44:27 -08:00
Brian Behlendorf 997a274a13 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 14:44:25 -08:00
Brian Behlendorf e5a60734a7 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-22 14:44:21 -08:00