Commit Graph

5282 Commits

Author SHA1 Message Date
Brian Behlendorf 22e3c8f012 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-18 11:52:45 -08:00
Brian Behlendorf 5fbb027bf6 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-18 11:52:43 -08:00
Brian Behlendorf 520c1ad31a Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 11:52:39 -08:00
Brian Behlendorf 830b60aae2 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-18 11:52:37 -08:00
Brian Behlendorf 04e2ea5ccb Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-18 11:52:34 -08:00
Brian Behlendorf b7bc2d2d19 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-18 11:52:32 -08:00
Brian Behlendorf f535c63cb6 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-18 11:52:29 -08:00
Brian Behlendorf 88e5d1800e Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-18 11:52:27 -08:00
Brian Behlendorf 892185ee47 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-18 11:52:23 -08:00
Brian Behlendorf 2bccb1031a Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-18 11:52:22 -08:00
Brian Behlendorf 1198598b9f Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-18 11:52:18 -08:00
Brian Behlendorf 8531efbaf7 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 11:52:17 -08:00
Brian Behlendorf 0ce76d622f Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-18 11:52:13 -08:00
Brian Behlendorf f94274b339 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 11:52:12 -08:00
Brian Behlendorf ec6250d9eb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 11:52:11 -08:00
Brian Behlendorf 1af8cdfdf7 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-18 11:52:06 -08:00
Brian Behlendorf 5242f45431 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-18 11:52:04 -08:00
Brian Behlendorf 5c0f0ca54f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 11:52:03 -08:00
Brian Behlendorf 524ae44c83 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-18 11:51:58 -08:00
Brian Behlendorf 3cc05d15f3 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 11:51:56 -08:00
Brian Behlendorf f8c2cccba2 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-18 11:51:53 -08:00
Brian Behlendorf d8d2ea124a Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-18 11:51:51 -08:00
Brian Behlendorf e69ef0457c Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-18 11:51:48 -08:00
Brian Behlendorf ff18e314b5 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-18 11:51:46 -08:00
Brian Behlendorf 21f32c1d4a Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-18 11:51:42 -08:00
Brian Behlendorf 7413a793e5 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-18 11:51:41 -08:00
Brian Behlendorf b9eb05ccfb Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-18 11:51:37 -08:00
Brian Behlendorf 16e04cd722 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-18 11:51:35 -08:00
Brian Behlendorf c1d6a678b0 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-18 11:51:32 -08:00
Brian Behlendorf a9907e3e86 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-18 11:51:31 -08:00
Brian Behlendorf 85d3241806 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 11:51:27 -08:00
Brian Behlendorf b6fdf1c533 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-18 11:51:25 -08:00
Brian Behlendorf 4be8cdca38 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 11:51:24 -08:00
Brian Behlendorf fe6a073e02 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-18 11:51:23 -08:00
Brian Behlendorf cf4b3895f1 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 11:51:23 -08:00
Brian Behlendorf 458a2444c2 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 11:51:22 -08:00
Brian Behlendorf d957a6c66f Resolve dnp shadow conflict 2008-12-18 11:49:22 -08:00
Brian Behlendorf 15d98e1ec1 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-18 11:45:21 -08:00
Brian Behlendorf defc1666a2 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-18 11:45:19 -08:00
Brian Behlendorf 72bc7f8c6e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-18 11:45:16 -08:00
Brian Behlendorf 0012224dbe Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-18 11:45:15 -08:00
Brian Behlendorf af9e256827 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-18 11:45:11 -08:00
Brian Behlendorf edd02a00c0 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-18 11:45:10 -08:00
Brian Behlendorf 51ee95825a Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-18 11:45:07 -08:00
Brian Behlendorf 47f82dde61 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-18 11:45:05 -08:00
Brian Behlendorf d3f7eac830 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-18 11:45:02 -08:00
Brian Behlendorf 3d73450050 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-18 11:45:00 -08:00
Brian Behlendorf 704b4672de Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-18 11:44:57 -08:00
Brian Behlendorf 530ec4a70a Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-18 11:44:56 -08:00
Brian Behlendorf 04d2824271 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 11:44:53 -08:00