Commit Graph

8051 Commits

Author SHA1 Message Date
Brian Behlendorf eb207b74fd Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-06 09:31:08 -08:00
Brian Behlendorf c007e09cae Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-06 09:31:07 -08:00
Brian Behlendorf d5ca89c493 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-06 09:31:04 -08:00
Brian Behlendorf 802acd05cf Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-06 09:31:02 -08:00
Brian Behlendorf 894636a700 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:59 -08:00
Brian Behlendorf 2d844567bd Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-06 09:30:58 -08:00
Brian Behlendorf 3c62d10598 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:55 -08:00
Brian Behlendorf 61032f1ce6 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-06 09:30:54 -08:00
Brian Behlendorf 8c08b72483 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:51 -08:00
Brian Behlendorf 37555b8fe3 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-06 09:30:49 -08:00
Brian Behlendorf d75303b007 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:46 -08:00
Brian Behlendorf 7d73a17e54 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-06 09:30:45 -08:00
Brian Behlendorf 1c8fca2eca Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:42 -08:00
Brian Behlendorf 03a7b3761b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-06 09:30:41 -08:00
Brian Behlendorf 5d356db791 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:38 -08:00
Brian Behlendorf ac63920b2c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 09:30:36 -08:00
Brian Behlendorf abca9d8b9a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 09:30:36 -08:00
Brian Behlendorf 8aed984c7e Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:31 -08:00
Brian Behlendorf 82458be35a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-06 09:30:30 -08:00
Brian Behlendorf bc820e95a6 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-06 09:30:29 -08:00
Brian Behlendorf 1775e769d4 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:24 -08:00
Brian Behlendorf be5d20f436 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-06 09:30:23 -08:00
Brian Behlendorf f207329aa9 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:20 -08:00
Brian Behlendorf 0a3f36db42 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-06 09:30:18 -08:00
Brian Behlendorf 76e09bae1e Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:16 -08:00
Brian Behlendorf bb12f70b49 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-06 09:30:14 -08:00
Brian Behlendorf e65c8e4d42 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:11 -08:00
Brian Behlendorf 9419d8aba2 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-06 09:30:10 -08:00
Brian Behlendorf 9e95d6117e Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:07 -08:00
Brian Behlendorf 4adeb6cd65 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-06 09:30:06 -08:00
Brian Behlendorf e50f33202f Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-06 09:30:03 -08:00
Brian Behlendorf e8b6428c6a Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-06 09:30:01 -08:00
Brian Behlendorf 2da97a44c2 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-06 09:29:59 -08:00
Brian Behlendorf ea60914948 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-06 09:29:57 -08:00
Brian Behlendorf 5f9b0590f5 Remove zfs_fuid for now from kernel source until needed by ZPL 2009-01-06 09:28:09 -08:00
Brian Behlendorf 85f4c977c5 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-06 09:16:22 -08:00
Brian Behlendorf 3c6c265b92 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-06 09:16:21 -08:00
Brian Behlendorf 592a900f44 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-06 09:16:18 -08:00
Brian Behlendorf f6f3c46840 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 09:16:17 -08:00
Brian Behlendorf e4a4ad147a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 09:16:16 -08:00
Brian Behlendorf cc40d91977 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-06 09:16:12 -08:00
Brian Behlendorf a9361a459e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-06 09:16:10 -08:00
Brian Behlendorf d71643eb94 Refresh exported symbols 2009-01-06 09:14:10 -08:00
Brian Behlendorf 9a4b808627 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-06 09:03:59 -08:00
Brian Behlendorf 574f1ecfec Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-06 09:03:57 -08:00
Brian Behlendorf 0ed3a3d48a Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-06 09:03:54 -08:00
Brian Behlendorf 43e4426b34 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 09:03:52 -08:00
Brian Behlendorf b521002205 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 09:03:51 -08:00
Brian Behlendorf 3013823bbe Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-06 09:03:44 -08:00
Brian Behlendorf bb6a56e778 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-06 09:03:39 -08:00