Commit Graph

6770 Commits

Author SHA1 Message Date
Brian Behlendorf e312947ff3 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-05 11:21:54 -08:00
Brian Behlendorf 564fd962c1 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 11:21:53 -08:00
Brian Behlendorf 719c769d20 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 11:21:52 -08:00
Brian Behlendorf 5a5f5a214a Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-05 11:21:47 -08:00
Brian Behlendorf f25972b809 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 11:21:45 -08:00
Brian Behlendorf 4fc91de1fe Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 11:21:45 -08:00
Brian Behlendorf 95a4f0f6c4 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-05 11:21:39 -08:00
Brian Behlendorf d8b248a97a Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-05 11:21:38 -08:00
Brian Behlendorf a2855e5b01 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-05 11:21:35 -08:00
Brian Behlendorf d2c29ef03a Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-05 11:21:33 -08:00
Brian Behlendorf 4731793a89 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-05 11:21:30 -08:00
Brian Behlendorf 71102ea91e Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-05 11:21:28 -08:00
Brian Behlendorf e6b4aab0ca Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-05 11:21:25 -08:00
Brian Behlendorf 0b35a8c9c6 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 11:21:24 -08:00
Brian Behlendorf 37cd723e16 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-05 11:21:21 -08:00
Brian Behlendorf ea48ed70fc Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-05 11:21:19 -08:00
Brian Behlendorf 1713e3cc47 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-05 11:21:16 -08:00
Brian Behlendorf 21a1b84a3e Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-05 11:21:15 -08:00
Brian Behlendorf e3b6de2c22 Remove zdump 2009-01-05 11:20:33 -08:00
Brian Behlendorf f4c3301b20 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-05 11:20:02 -08:00
Brian Behlendorf 6fd7b17036 Remove remaining zdump Makefile references 2009-01-05 11:18:06 -08:00
Brian Behlendorf dc383227b3 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-05 11:16:27 -08:00
Brian Behlendorf ca7e851794 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 11:16:26 -08:00
Brian Behlendorf 8ebf3faecc Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-05 11:16:22 -08:00
Brian Behlendorf 8186f8aa7a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-05 11:16:21 -08:00
Brian Behlendorf 403fec229e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-05 11:16:18 -08:00
Brian Behlendorf a78e5154e9 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-05 11:16:17 -08:00
Brian Behlendorf 1b9bb5150b Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-05 11:16:13 -08:00
Brian Behlendorf 3767655021 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-05 11:16:11 -08:00
Brian Behlendorf 54fab589a3 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-05 11:16:08 -08:00
Brian Behlendorf 045d42028a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-05 11:16:07 -08:00
Brian Behlendorf 4f7b080356 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-05 11:16:03 -08:00
Brian Behlendorf e908f1b867 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-05 11:16:02 -08:00
Brian Behlendorf 60806a7dc1 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-05 11:15:58 -08:00
Brian Behlendorf 16dd572f9b Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-05 11:15:57 -08:00
Brian Behlendorf 71175497ea Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-05 11:15:54 -08:00
Brian Behlendorf 4452a0ab44 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-05 11:15:52 -08:00
Brian Behlendorf 5712d00983 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-05 11:15:49 -08:00
Brian Behlendorf 809771a703 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-05 11:15:47 -08:00
Brian Behlendorf c81c4c6186 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-05 11:15:44 -08:00
Brian Behlendorf 66f92fff4f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-05 11:15:43 -08:00
Brian Behlendorf 02656f034f Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-05 11:15:39 -08:00
Brian Behlendorf 73312e0271 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 11:15:38 -08:00
Brian Behlendorf c29cc86753 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-05 11:15:35 -08:00
Brian Behlendorf 244f44f903 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 11:15:33 -08:00
Brian Behlendorf 01f70dc8f5 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 11:15:32 -08:00
Brian Behlendorf c6044c2cef Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-05 11:15:27 -08:00
Brian Behlendorf 3d4fecf261 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 11:15:25 -08:00
Brian Behlendorf f21eb66cdc Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 11:15:25 -08:00
Brian Behlendorf e1e7a302f9 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-05 11:15:19 -08:00