Commit Graph

6148 Commits

Author SHA1 Message Date
Brian Behlendorf f9e9bba2a4 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 11:41:28 -08:00
Brian Behlendorf 187be3051e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 11:41:27 -08:00
Brian Behlendorf d812a197ef Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-22 11:41:22 -08:00
Brian Behlendorf de4c82e397 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-22 11:41:20 -08:00
Brian Behlendorf 0734d455b6 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-22 11:41:17 -08:00
Brian Behlendorf 85797a38b0 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-22 11:41:15 -08:00
Brian Behlendorf b19050b6aa Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-22 11:41:12 -08:00
Brian Behlendorf 7f2da73568 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 11:41:11 -08:00
Brian Behlendorf b0ca34bbd4 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-22 11:41:08 -08:00
Brian Behlendorf 7c2c27b087 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 11:41:06 -08:00
Brian Behlendorf 8d37e12b30 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-22 11:41:03 -08:00
Brian Behlendorf ed1931c363 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-22 11:41:01 -08:00
Brian Behlendorf 1ecbcc0720 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-22 11:40:58 -08:00
Brian Behlendorf 6f2ba49718 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-22 11:40:57 -08:00
Brian Behlendorf aece7f6822 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 11:40:54 -08:00
Brian Behlendorf d2fe1ae72b Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-22 11:40:52 -08:00
Brian Behlendorf 7403ce6856 Add missing Makefile foo 2008-12-22 11:38:58 -08:00
Brian Behlendorf 7047bb0678 Add missing files from Makefile.am 2008-12-22 11:36:48 -08:00
Brian Behlendorf 5778b308a3 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-22 11:31:00 -08:00
Brian Behlendorf c70fc4ec0e Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-22 11:30:58 -08:00
Brian Behlendorf 0d7af50a35 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 11:30:55 -08:00
Brian Behlendorf bed9292bdb Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 11:30:54 -08:00
Brian Behlendorf f2e9931a3a Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-22 11:30:50 -08:00
Brian Behlendorf b1a37a30a3 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 11:30:49 -08:00
Brian Behlendorf d0ab581c3d Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 11:30:46 -08:00
Brian Behlendorf 87a227044e Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 11:30:44 -08:00
Brian Behlendorf 458e16498e Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-22 11:30:41 -08:00
Brian Behlendorf 1894d88357 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-22 11:30:39 -08:00
Brian Behlendorf 4877232f37 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-22 11:30:36 -08:00
Brian Behlendorf c3d28dff20 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 11:30:35 -08:00
Brian Behlendorf 28c45110be Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-22 11:30:32 -08:00
Brian Behlendorf b97d408428 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 11:30:30 -08:00
Brian Behlendorf fa61cfbd99 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 11:30:27 -08:00
Brian Behlendorf ed05a1eaf2 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-22 11:30:25 -08:00
Brian Behlendorf 7144d73a02 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 11:30:22 -08:00
Brian Behlendorf a97fc13639 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 11:30:21 -08:00
Brian Behlendorf 55fefa702d Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-22 11:30:17 -08:00
Brian Behlendorf a78504bfcd Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 11:30:15 -08:00
Brian Behlendorf 8ac9d0e5ef Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-22 11:30:12 -08:00
Brian Behlendorf 65c1f65a81 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 11:30:11 -08:00
Brian Behlendorf 464310aa83 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-22 11:30:08 -08:00
Brian Behlendorf 72aaf61e8a Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 11:30:06 -08:00
Brian Behlendorf 16153aa31d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 11:30:06 -08:00
Brian Behlendorf a2bb545559 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-22 11:30:00 -08:00
Brian Behlendorf 3538a1a92f Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 11:29:59 -08:00
Brian Behlendorf b5a525cbf6 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 11:29:58 -08:00
Brian Behlendorf 505a649bd2 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-22 11:29:53 -08:00
Brian Behlendorf bcd882b137 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-22 11:29:51 -08:00
Brian Behlendorf 178e003675 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-22 11:29:48 -08:00
Brian Behlendorf 4d8eaa86df Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-22 11:29:47 -08:00