Commit Graph

6318 Commits

Author SHA1 Message Date
Brian Behlendorf 267153bf6d Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-22 16:42:41 -08:00
Brian Behlendorf 604c305d7f Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 16:42:39 -08:00
Brian Behlendorf eaed5a84f0 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-22 16:42:33 -08:00
Brian Behlendorf 117e4dc2ce Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 16:42:30 -08:00
Brian Behlendorf f322a64d07 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 16:42:23 -08:00
Brian Behlendorf ccac12e6f9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-22 16:42:21 -08:00
Brian Behlendorf 7406a970f4 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-22 16:42:14 -08:00
Brian Behlendorf ef4331cdf0 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 16:42:11 -08:00
Brian Behlendorf 3dc8f2d5eb Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-22 16:42:06 -08:00
Brian Behlendorf 8bfc1e7eec Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 16:42:03 -08:00
Brian Behlendorf 2025db4a7b Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-22 16:41:57 -08:00
Brian Behlendorf d35eb45584 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 16:41:55 -08:00
Brian Behlendorf f225784236 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 16:41:54 -08:00
Brian Behlendorf 8a4e43f06d Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-22 16:41:44 -08:00
Brian Behlendorf 5a3a0f14b9 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 16:41:41 -08:00
Brian Behlendorf 195ee69c7f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 16:41:40 -08:00
Brian Behlendorf 1d7c1855e7 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-22 16:41:29 -08:00
Brian Behlendorf a7d943e764 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-22 16:41:27 -08:00
Brian Behlendorf 2068b70c7d Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-22 16:41:20 -08:00
Brian Behlendorf 700de9e930 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-22 16:41:17 -08:00
Brian Behlendorf 67684fdc54 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-22 16:41:12 -08:00
Brian Behlendorf 38cb2df1a1 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 16:41:09 -08:00
Brian Behlendorf aecbf33bf1 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-22 16:41:03 -08:00
Brian Behlendorf 704ffcb1a1 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 16:41:00 -08:00
Brian Behlendorf cff4cc11ff Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-22 16:40:54 -08:00
Brian Behlendorf d3f305608f Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-22 16:40:52 -08:00
Brian Behlendorf cd946c4c37 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-22 16:40:47 -08:00
Brian Behlendorf 5bdd6c5952 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-22 16:40:45 -08:00
Brian Behlendorf 049d14bb79 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 16:40:39 -08:00
Brian Behlendorf d011707aa2 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-22 16:40:36 -08:00
Brian Behlendorf 44f75e4f86 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 16:40:35 -08:00
Brian Behlendorf e8e738e3b9 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 16:40:34 -08:00
Brian Behlendorf 9f2908cfb5 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-22 16:40:32 -08:00
Brian Behlendorf 01414a8906 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 16:40:31 -08:00
Brian Behlendorf f016a8e15f Update patch carried forward from old release 2008-12-22 16:35:36 -08:00
Brian Behlendorf 2f26eac98e Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-22 16:34:13 -08:00
Brian Behlendorf 9d4268f3be Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 16:34:09 -08:00
Brian Behlendorf 1c78e6e9c7 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-22 16:34:02 -08:00
Brian Behlendorf 6c1483df2f Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-22 16:33:58 -08:00
Brian Behlendorf 0ffe327df4 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 16:33:52 -08:00
Brian Behlendorf 643e0a3dba Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 16:33:49 -08:00
Brian Behlendorf c66f7d4d7f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-22 16:33:42 -08:00
Brian Behlendorf 06d397baa9 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 16:33:38 -08:00
Brian Behlendorf 54a489a85b Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 16:33:33 -08:00
Brian Behlendorf 68e000861c Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 16:33:29 -08:00
Brian Behlendorf fcfd350aab Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-22 16:33:23 -08:00
Brian Behlendorf d589833aad Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-22 16:33:20 -08:00
Brian Behlendorf bdacf2c5bd Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-22 16:33:13 -08:00
Brian Behlendorf e68e2e72c8 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 16:33:09 -08:00
Brian Behlendorf 28797bb239 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-22 16:33:03 -08:00