Commit Graph

3634 Commits

Author SHA1 Message Date
Brian Behlendorf a1fbc49b13 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-12 10:12:27 -08:00
Brian Behlendorf 9ca1163310 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 10:12:26 -08:00
Brian Behlendorf 13aca659bd Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-12 10:12:22 -08:00
Brian Behlendorf 13fa4f0f42 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-12 10:12:21 -08:00
Brian Behlendorf da3a0b0d1d Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-12 10:12:19 -08:00
Brian Behlendorf adbfba8f2a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 10:12:18 -08:00
Brian Behlendorf 6d69c9650c Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-12 10:12:15 -08:00
Brian Behlendorf 28c16d0bfa Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-12 10:12:13 -08:00
Brian Behlendorf 7006c958c2 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-12 10:12:11 -08:00
Brian Behlendorf 2fe423c3ff Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-12 10:12:10 -08:00
Brian Behlendorf fa50c57286 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-12 10:12:07 -08:00
Brian Behlendorf ee87309fb2 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-12 10:12:06 -08:00
Brian Behlendorf 9a4109a11c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 10:12:03 -08:00
Brian Behlendorf 32fbc073d2 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-12 10:12:02 -08:00
Brian Behlendorf 6d78e69193 Add missing include patch 2008-12-12 10:10:16 -08:00
Brian Behlendorf 5664869614 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 09:34:35 -08:00
Brian Behlendorf 303503be4d Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-12 09:34:34 -08:00
Brian Behlendorf 56f1015f8b Refresh Makefile.am 2008-12-12 09:32:53 -08:00
Brian Behlendorf 2e0a5f5461 Refresh makefiles and configure.ac 2008-12-12 09:30:42 -08:00
Brian Behlendorf 36415017a6 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 09:23:37 -08:00
Brian Behlendorf 983c10c8c1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 09:23:36 -08:00
Brian Behlendorf 4c9928f756 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-12 09:23:33 -08:00
Brian Behlendorf 8169eb1040 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-12 09:23:32 -08:00
Brian Behlendorf 4d6af13cdb Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 09:23:29 -08:00
Brian Behlendorf 450502ec0b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 09:23:28 -08:00
Brian Behlendorf 4a1a5dbbf6 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-12 09:23:25 -08:00
Brian Behlendorf b786639acd Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 09:23:24 -08:00
Brian Behlendorf fb3c2b7a8b Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-12 09:23:21 -08:00
Brian Behlendorf ee5c15a5ef Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 09:23:20 -08:00
Brian Behlendorf 1397a61615 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-12 09:23:17 -08:00
Brian Behlendorf f19b3228d3 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 09:23:16 -08:00
Brian Behlendorf bdcdafdae1 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 09:23:13 -08:00
Brian Behlendorf e4f01701a9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 09:23:12 -08:00
Brian Behlendorf 710e7f4528 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-12 09:23:09 -08:00
Brian Behlendorf bc031993d7 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 09:23:08 -08:00
Brian Behlendorf 64765fddf0 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-12 09:23:04 -08:00
Brian Behlendorf efbf9637d4 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 09:23:03 -08:00
Brian Behlendorf ee566c662d Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-12 09:23:00 -08:00
Brian Behlendorf 2ad15bb834 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 09:22:59 -08:00
Brian Behlendorf 6d56b617b0 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-12 09:22:56 -08:00
Brian Behlendorf 29d5998baf Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 09:22:55 -08:00
Brian Behlendorf f2dc02c87c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 09:22:55 -08:00
Brian Behlendorf 80135e401b Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-12 09:22:50 -08:00
Brian Behlendorf b643dc493f Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-12 09:22:49 -08:00
Brian Behlendorf 8516e2d45e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 09:22:48 -08:00
Brian Behlendorf 099baa2f4b Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-12 09:22:43 -08:00
Brian Behlendorf fdb922a832 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 09:22:42 -08:00
Brian Behlendorf f8cb976737 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-12 09:22:39 -08:00
Brian Behlendorf 188c1f3e53 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-12 09:22:38 -08:00
Brian Behlendorf 280f5146df Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-12 09:22:35 -08:00