Commit Graph

3097 Commits

Author SHA1 Message Date
Brian Behlendorf fa6f59d307 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:29 -08:00
Brian Behlendorf 0d8f315e3d Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 11:07:28 -08:00
Brian Behlendorf 3dcb4f5331 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:25 -08:00
Brian Behlendorf 4e3a43cb70 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 11:07:24 -08:00
Brian Behlendorf a044ae9743 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:21 -08:00
Brian Behlendorf 3088684851 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 11:07:20 -08:00
Brian Behlendorf 4b9680936d Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:17 -08:00
Brian Behlendorf c51c9226a5 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 11:07:16 -08:00
Brian Behlendorf 1c3d72b358 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:13 -08:00
Brian Behlendorf 3d753d3be5 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 11:07:12 -08:00
Brian Behlendorf bd60d32406 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:08 -08:00
Brian Behlendorf a46fb06d3f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 11:07:07 -08:00
Brian Behlendorf 88de88c1b9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 11:07:07 -08:00
Brian Behlendorf 683121d251 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:01 -08:00
Brian Behlendorf 07e0026402 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-12 11:07:00 -08:00
Brian Behlendorf 1cb6a4e6e7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 11:06:59 -08:00
Brian Behlendorf a4d6f0ed4b Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-12 11:06:53 -08:00
Brian Behlendorf 58d3c91fa2 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 11:06:52 -08:00
Brian Behlendorf 361b0725f1 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-12 11:06:49 -08:00
Brian Behlendorf 12dc1e32c7 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-12 11:06:48 -08:00
Brian Behlendorf 05f4f35bcb Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-12 11:06:45 -08:00
Brian Behlendorf 86e0736858 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 11:06:44 -08:00
Brian Behlendorf 66a8109e46 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-12 11:06:41 -08:00
Brian Behlendorf 0cbdcbf290 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-12 11:06:40 -08:00
Brian Behlendorf a0a01c9742 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-12 11:06:37 -08:00
Brian Behlendorf 4a9868ae53 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-12 11:06:36 -08:00
Brian Behlendorf 777d73cc99 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-12 11:06:33 -08:00
Brian Behlendorf 35b934c349 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-12 11:06:32 -08:00
Brian Behlendorf 8a079bb853 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 11:06:29 -08:00
Brian Behlendorf d94241bb28 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-12 11:06:28 -08:00
Brian Behlendorf ded433714f Refine Makefiles 2008-12-12 11:04:44 -08:00
Brian Behlendorf d50d51273d Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 11:00:08 -08:00
Brian Behlendorf 33833181c1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 11:00:07 -08:00
Brian Behlendorf b6d2341cd6 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-12 11:00:04 -08:00
Brian Behlendorf 52cc85450f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-12 11:00:03 -08:00
Brian Behlendorf 7bbf7a8c98 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 11:00:00 -08:00
Brian Behlendorf 39a0dfe6cf Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 10:59:59 -08:00
Brian Behlendorf d1ef2693e6 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-12 10:59:56 -08:00
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