Commit Graph

7589 Commits

Author SHA1 Message Date
Brian Behlendorf ef8ca905d2 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-23 12:51:16 -08:00
Brian Behlendorf cf960f0741 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-23 12:51:13 -08:00
Brian Behlendorf c8a87608d6 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-23 12:51:12 -08:00
Brian Behlendorf 8e79e3f921 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-23 12:51:08 -08:00
Brian Behlendorf b4c584906e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 12:51:07 -08:00
Brian Behlendorf 9b3e361b6e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 12:51:06 -08:00
Brian Behlendorf 62a472a93e Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-23 12:51:01 -08:00
Brian Behlendorf 1d4f536ffd Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-23 12:50:59 -08:00
Brian Behlendorf c22ff325ce Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 12:50:58 -08:00
Brian Behlendorf 181cceb1d1 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-23 12:50:53 -08:00
Brian Behlendorf a4bfe3ace7 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-23 12:50:51 -08:00
Brian Behlendorf d90aad60ec Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-23 12:50:48 -08:00
Brian Behlendorf f6368dc480 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-23 12:50:47 -08:00
Brian Behlendorf ba36020361 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-23 12:50:43 -08:00
Brian Behlendorf 6c2ca6723f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-23 12:50:42 -08:00
Brian Behlendorf f5a13c9064 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-23 12:50:39 -08:00
Brian Behlendorf a3ad24a094 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-23 12:50:37 -08:00
Brian Behlendorf 59405fc075 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-23 12:50:34 -08:00
Brian Behlendorf a0451d884a Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-23 12:50:32 -08:00
Brian Behlendorf eb9545532f Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-23 12:50:29 -08:00
Brian Behlendorf b2bcef21ee Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-23 12:50:27 -08:00
Brian Behlendorf 13dd1298b6 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-23 12:50:24 -08:00
Brian Behlendorf 7f1c37bac0 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-23 12:50:22 -08:00
Brian Behlendorf 0dfd5ebee8 module/zcommon/Makefile.in 2008-12-23 12:47:03 -08:00
Brian Behlendorf cfc755d792 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:58 -08:00
Brian Behlendorf 72ad2bab17 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-23 11:50:57 -08:00
Brian Behlendorf f1768f965e Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:53 -08:00
Brian Behlendorf 8aedc9f4e0 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-23 11:50:52 -08:00
Brian Behlendorf a1d70097a5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:49 -08:00
Brian Behlendorf f644c31fe8 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-23 11:50:48 -08:00
Brian Behlendorf 4cd3b9515a Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:44 -08:00
Brian Behlendorf d1e7610b2c Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-23 11:50:43 -08:00
Brian Behlendorf 823cd705b8 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:39 -08:00
Brian Behlendorf 29550399c6 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-23 11:50:38 -08:00
Brian Behlendorf 6ef86a4fc6 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:35 -08:00
Brian Behlendorf 6b2ced4447 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-23 11:50:33 -08:00
Brian Behlendorf 6bd369001e Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:30 -08:00
Brian Behlendorf 6020c512e5 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-23 11:50:29 -08:00
Brian Behlendorf 52d613e4b1 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:25 -08:00
Brian Behlendorf 67d2cff1ac Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-23 11:50:24 -08:00
Brian Behlendorf 40a1f6b444 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:21 -08:00
Brian Behlendorf 4f98a245f4 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-23 11:50:19 -08:00
Brian Behlendorf 680d4c1618 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:16 -08:00
Brian Behlendorf 5fe9881ef0 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-23 11:50:15 -08:00
Brian Behlendorf 4125870825 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:12 -08:00
Brian Behlendorf 7c6d905ec3 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-23 11:50:11 -08:00
Brian Behlendorf 9e620a29e9 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:07 -08:00
Brian Behlendorf 1431c8e452 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 11:50:06 -08:00
Brian Behlendorf 8209bef3af Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 11:50:05 -08:00
Brian Behlendorf 7c593a896e Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-23 11:50:00 -08:00