Commit Graph

12620 Commits

Author SHA1 Message Date
Brian Behlendorf a5f0759d5b Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-06-09 14:39:18 -07:00
Brian Behlendorf 999035eb32 Only powerpc64 is currently supported not powerpc. 2009-06-09 14:20:44 -07:00
Brian Behlendorf 33ac40573e Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-06-08 16:32:03 -07:00
Brian Behlendorf fedc9fdfa5 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-06-08 16:31:54 -07:00
Brian Behlendorf 6d7e70b67e Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-06-08 16:31:13 -07:00
Brian Behlendorf 4ea4ea6ede Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-06-08 16:31:01 -07:00
Brian Behlendorf f64d802b64 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-06-08 16:30:39 -07:00
Brian Behlendorf e8f0e32357 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-06-08 16:30:34 -07:00
Brian Behlendorf 727764d7a3 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-06-08 16:30:13 -07:00
Brian Behlendorf e37e28fd82 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-06-08 16:30:09 -07:00
Brian Behlendorf 1ebc080e31 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-06-08 16:29:48 -07:00
Brian Behlendorf cfdfd81eb1 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-06-08 16:29:43 -07:00
Brian Behlendorf 0b301c01fc Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-06-08 16:29:23 -07:00
Brian Behlendorf 97ee949fb5 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-06-08 16:29:18 -07:00
Brian Behlendorf b6890e6722 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-06-08 16:28:58 -07:00
Brian Behlendorf 3fc7001ff8 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-06-08 16:28:53 -07:00
Brian Behlendorf 5a68e80ed0 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-06-08 16:28:34 -07:00
Brian Behlendorf 6892ef3f71 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-06-08 16:28:29 -07:00
Brian Behlendorf 5967a8508e Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-06-08 16:28:08 -07:00
Brian Behlendorf ea1569a00b Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-06-08 16:28:04 -07:00
Brian Behlendorf 1fddcfb34e Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-06-08 16:27:43 -07:00
Brian Behlendorf d661f4c5cc Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-06-08 16:27:38 -07:00
Brian Behlendorf 6d0913d070 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-06-08 16:27:19 -07:00
Brian Behlendorf 9667a07af6 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-06-08 16:27:14 -07:00
Brian Behlendorf 5dea9e257e Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-06-08 16:26:54 -07:00
Brian Behlendorf 6c1d42c3f8 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-06-08 16:26:49 -07:00
Brian Behlendorf 73aa76fd28 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-06-08 16:26:46 -07:00
Brian Behlendorf e2f90021d1 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-06-08 16:26:10 -07:00
Brian Behlendorf 6ef9783efb Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-06-08 16:26:06 -07:00
Brian Behlendorf 3fe3541cd5 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-06-08 16:26:03 -07:00
Brian Behlendorf 12dddba89e Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-06-08 16:25:27 -07:00
Brian Behlendorf b9ab2a90bc Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-06-08 16:25:21 -07:00
Brian Behlendorf 763cc437f4 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-06-08 16:25:00 -07:00
Brian Behlendorf 18bd989532 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-06-08 16:24:55 -07:00
Brian Behlendorf 378a9aec92 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-06-08 16:24:35 -07:00
Brian Behlendorf af73cf4a80 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-06-08 16:24:30 -07:00
Brian Behlendorf b54ec7e167 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-06-08 16:24:10 -07:00
Brian Behlendorf dd6c0ca4bc Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-06-08 16:24:05 -07:00
Brian Behlendorf 36b30ac090 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-06-08 16:23:42 -07:00
Brian Behlendorf 5161dff7ab Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-06-08 16:23:38 -07:00
Brian Behlendorf 78c925d5f3 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-06-08 16:23:16 -07:00
Brian Behlendorf d6624c8316 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-06-08 16:23:11 -07:00
Brian Behlendorf bc67b156ea Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-06-08 16:22:49 -07:00
Brian Behlendorf 23f12a492d Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-06-08 16:22:44 -07:00
Brian Behlendorf 3f3cebdcda libspl support for conditional SUBDIRs based on target arch 2009-06-08 16:10:12 -07:00
Brian Behlendorf 9c347d872f Core target arch support for conditional compilation of SUBDIRs
which is used by libspl for it's arch specific atomic implementations.
2009-06-08 16:07:43 -07:00
Brian Behlendorf 1f71ee5d53 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-06-08 13:24:24 -07:00
Brian Behlendorf 26bea36f61 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-06-08 13:24:19 -07:00
Brian Behlendorf 2968e197aa Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-06-08 13:24:17 -07:00
Brian Behlendorf 737a6ba81a Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-06-08 13:23:40 -07:00