Commit Graph

4767 Commits

Author SHA1 Message Date
Brian Behlendorf 6598d98791 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-16 09:04:27 -08:00
Brian Behlendorf ddf43eeab5 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-16 09:04:24 -08:00
Brian Behlendorf 1410a4a4f9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-16 09:04:22 -08:00
Brian Behlendorf b3d39901d1 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-16 09:04:11 -08:00
Brian Behlendorf 11fc60303f Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-16 09:04:07 -08:00
Brian Behlendorf ef55a13da8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 09:04:03 -08:00
Brian Behlendorf 6563d0f63c Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-16 09:03:51 -08:00
Brian Behlendorf 741949331a Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-16 09:03:48 -08:00
Brian Behlendorf 802db98bcc Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-16 09:03:41 -08:00
Brian Behlendorf a3e5ad8d2f Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-16 09:03:38 -08:00
Brian Behlendorf a793df1278 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-16 09:03:31 -08:00
Brian Behlendorf 589a6c72d6 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 09:03:27 -08:00
Brian Behlendorf cfda54231f Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-16 09:03:21 -08:00
Brian Behlendorf 4504aa575b Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-16 09:03:17 -08:00
Brian Behlendorf cf64034312 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-16 09:03:11 -08:00
Brian Behlendorf eae94f1e2f Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-16 09:03:08 -08:00
Brian Behlendorf 0f4be2d50e Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-16 09:03:01 -08:00
Brian Behlendorf 100ef5ed1a Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-16 09:02:57 -08:00
Brian Behlendorf 3ba34afff8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 09:02:49 -08:00
Brian Behlendorf 038c00ee18 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-16 09:02:42 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
Brian Behlendorf a3f0afc0b2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 08:48:58 -08:00
Brian Behlendorf 91e0b5ca89 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-16 08:48:53 -08:00
Brian Behlendorf c0abfccb28 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 08:48:49 -08:00
Brian Behlendorf b74b9388b9 Add zfs_config include 2008-12-16 08:44:37 -08:00
Brian Behlendorf bffca6c378 Refresh autogen products 2008-12-15 16:58:02 -08:00
Brian Behlendorf f254643f57 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-15 16:56:51 -08:00
Brian Behlendorf c1ac13264c Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-15 16:56:45 -08:00
Brian Behlendorf 0ae73cfa11 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-15 16:56:42 -08:00
Brian Behlendorf f4731393a7 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-15 16:56:39 -08:00
Brian Behlendorf e6550ccba2 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-15 16:56:33 -08:00
Brian Behlendorf c2f89a5761 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-15 16:56:30 -08:00
Brian Behlendorf e9f63a7dff Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-15 16:56:22 -08:00
Brian Behlendorf a084b6e645 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-15 16:56:19 -08:00
Brian Behlendorf e7f91cb188 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-15 16:56:11 -08:00
Brian Behlendorf 6b4a70c477 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-15 16:56:07 -08:00
Brian Behlendorf f6f04cfd87 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-15 16:56:00 -08:00
Brian Behlendorf 336c8055c6 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-15 16:55:57 -08:00
Brian Behlendorf 4e0ffb51c2 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-15 16:55:49 -08:00
Brian Behlendorf d2f2f62125 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-15 16:55:46 -08:00
Brian Behlendorf 193d89c038 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-15 16:55:39 -08:00
Brian Behlendorf 9443521f90 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-15 16:55:35 -08:00
Brian Behlendorf ae5a01b59d Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-15 16:55:28 -08:00
Brian Behlendorf 58c1b638bf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-15 16:55:24 -08:00
Brian Behlendorf 9c360371c2 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-15 16:55:16 -08:00
Brian Behlendorf c71c97f751 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-15 16:55:12 -08:00
Brian Behlendorf be13012b93 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-15 16:55:05 -08:00
Brian Behlendorf d33405893f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-15 16:55:01 -08:00
Brian Behlendorf ea03951fc0 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-15 16:54:54 -08:00
Brian Behlendorf 9fa0444ffa Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-15 16:54:51 -08:00