Commit Graph

9187 Commits

Author SHA1 Message Date
Brian Behlendorf 87ebfc346a Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-15 15:41:30 -08:00
Brian Behlendorf f4dd165bf3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 15:41:28 -08:00
Brian Behlendorf af509e9bd1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 15:41:27 -08:00
Brian Behlendorf 23f1db3f6c Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-15 15:41:22 -08:00
Brian Behlendorf 9683bf3e71 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-15 15:41:20 -08:00
Brian Behlendorf f793af51b4 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 15:41:19 -08:00
Brian Behlendorf bfccd809f0 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-15 15:41:13 -08:00
Brian Behlendorf a0ba3bb0f9 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 15:41:11 -08:00
Brian Behlendorf 5f1cea44a0 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-15 15:41:08 -08:00
Brian Behlendorf 3950a21573 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-15 15:41:06 -08:00
Brian Behlendorf 975fd56adb Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-15 15:41:03 -08:00
Brian Behlendorf 08567d3be9 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-15 15:41:01 -08:00
Brian Behlendorf c5f0e54389 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-15 15:40:58 -08:00
Brian Behlendorf c41eda4350 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-15 15:40:56 -08:00
Brian Behlendorf 2e751c49d6 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-15 15:40:53 -08:00
Brian Behlendorf 6fe4071734 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-15 15:40:51 -08:00
Brian Behlendorf 6a062a18c1 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-15 15:40:47 -08:00
Brian Behlendorf 7935b2c226 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-15 15:40:46 -08:00
Brian Behlendorf de2098cc11 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 15:40:42 -08:00
Brian Behlendorf 08c74860ea Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 15:40:40 -08:00
Brian Behlendorf 0197f3a298 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:40:39 -08:00
Brian Behlendorf 975c613269 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 15:40:39 -08:00
Brian Behlendorf 61ec157623 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-15 15:40:38 -08:00
Brian Behlendorf 51730cdeae Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 15:40:37 -08:00
Brian Behlendorf 37a3478d58 Resolve C90 int declared in for() construct 2009-01-15 15:38:26 -08:00
Brian Behlendorf 7a69c51d43 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-01-15 15:31:09 -08:00
Brian Behlendorf 066f228773 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-01-15 15:31:07 -08:00
Brian Behlendorf 1fa1b15463 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-15 15:31:04 -08:00
Brian Behlendorf 38a2cb40de Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 15:31:02 -08:00
Brian Behlendorf cbcdd415ec Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:59 -08:00
Brian Behlendorf a989dabb8d Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-15 15:30:57 -08:00
Brian Behlendorf 5ee56816a6 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:53 -08:00
Brian Behlendorf 1b0e5b1902 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-15 15:30:52 -08:00
Brian Behlendorf 88d325bf3b Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:48 -08:00
Brian Behlendorf 50a6b919a4 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 15:30:46 -08:00
Brian Behlendorf 7ef9644040 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:43 -08:00
Brian Behlendorf 7b3b6adfad Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-15 15:30:41 -08:00
Brian Behlendorf f17bb6c6d8 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:38 -08:00
Brian Behlendorf d2f140978a Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-15 15:30:36 -08:00
Brian Behlendorf 4162fdc0d8 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:32 -08:00
Brian Behlendorf 20942db96a Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-15 15:30:31 -08:00
Brian Behlendorf cd7eabc421 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:27 -08:00
Brian Behlendorf 50881047b6 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-15 15:30:25 -08:00
Brian Behlendorf 205087bdac Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:22 -08:00
Brian Behlendorf 461fe17e5f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 15:30:20 -08:00
Brian Behlendorf 15a865fdaa Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:17 -08:00
Brian Behlendorf 14caea82a9 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-15 15:30:15 -08:00
Brian Behlendorf 9b04c3108d Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:11 -08:00
Brian Behlendorf 1724a1dd37 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-15 15:30:10 -08:00
Brian Behlendorf 8f2e12e852 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:06 -08:00