Commit Graph

2841 Commits

Author SHA1 Message Date
Brian Behlendorf 22c6bb4c26 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 10:59:55 -08:00
Brian Behlendorf 941c566d77 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:52 -08:00
Brian Behlendorf 527ec63608 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 10:59:51 -08:00
Brian Behlendorf 9a64c8cec1 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:48 -08:00
Brian Behlendorf 78eed11ed5 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 10:59:46 -08:00
Brian Behlendorf f712ad57d8 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:43 -08:00
Brian Behlendorf be2a436e28 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 10:59:42 -08:00
Brian Behlendorf 00197393ac Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:39 -08:00
Brian Behlendorf 08f2e57b8c Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 10:59:38 -08:00
Brian Behlendorf 46823a4c19 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:35 -08:00
Brian Behlendorf 7e9bd9b2d7 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 10:59:34 -08:00
Brian Behlendorf 7e8e190282 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:31 -08:00
Brian Behlendorf 601b2d2c43 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 10:59:30 -08:00
Brian Behlendorf 9f018d830a Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:27 -08:00
Brian Behlendorf 8166d4835a Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 10:59:26 -08:00
Brian Behlendorf fbb5c2ca7c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 10:59:26 -08:00
Brian Behlendorf 1508ee88d4 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:21 -08:00
Brian Behlendorf ff9d89d621 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-12 10:59:20 -08:00
Brian Behlendorf 4d54aed828 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:59:19 -08:00
Brian Behlendorf 97deac488f Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:14 -08:00
Brian Behlendorf 775b36b66c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 10:59:13 -08:00
Brian Behlendorf 398c129d85 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:10 -08:00
Brian Behlendorf 08e08bdc10 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-12 10:59:09 -08:00
Brian Behlendorf 5de2145837 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:06 -08:00
Brian Behlendorf 8d9ea8f9d5 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 10:59:05 -08:00
Brian Behlendorf 0052b34103 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:02 -08:00
Brian Behlendorf 426831dad5 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-12 10:59:01 -08:00
Brian Behlendorf 9ae9d379d8 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-12 10:58:58 -08:00
Brian Behlendorf de4d714042 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-12 10:58:57 -08:00
Brian Behlendorf 7fc34cb04b Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-12 10:58:54 -08:00
Brian Behlendorf cf6a11c0b1 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-12 10:58:53 -08:00
Brian Behlendorf da10598d26 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 10:58:50 -08:00
Brian Behlendorf 02e9ccefa0 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-12 10:58:49 -08:00
Brian Behlendorf 9fbc572a59 Refine Makefiles 2008-12-12 10:57:05 -08:00
Brian Behlendorf 8182ac40b1 Refresh autogen products 2008-12-12 10:49:23 -08:00
Brian Behlendorf 79edf81a7d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 10:47:00 -08:00
Brian Behlendorf 3fd5d544f4 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-12 10:45:40 -08:00
Brian Behlendorf 1bea68271c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 10:45:39 -08:00
Brian Behlendorf bef1b1cd5b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:45:38 -08:00
Brian Behlendorf 65301eeff3 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-12 10:45:35 -08:00
Brian Behlendorf 03de62e123 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-12 10:45:34 -08:00
Brian Behlendorf 08a3090c62 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 10:45:31 -08:00
Brian Behlendorf 22c2a372b9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 10:45:30 -08:00
Brian Behlendorf 791583b29f Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-12 10:45:27 -08:00
Brian Behlendorf 72cd8c55a9 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 10:45:26 -08:00
Brian Behlendorf 50400a0fd2 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-12 10:45:22 -08:00
Brian Behlendorf 9b5e835cb9 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 10:45:21 -08:00
Brian Behlendorf d33f9b3b21 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-12 10:45:17 -08:00
Brian Behlendorf d2b8537008 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 10:45:16 -08:00
Brian Behlendorf 2359e4e5f0 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 10:45:13 -08:00