Commit Graph

4767 Commits

Author SHA1 Message Date
Brian Behlendorf 1c78d7d61d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 09:36:25 -08:00
Brian Behlendorf 57465ea3af Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-18 09:36:23 -08:00
Brian Behlendorf fe5b927a4a Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 09:36:22 -08:00
Brian Behlendorf 0a6ac25d10 Add vmem_ interface mapping for user space 2008-12-18 09:34:27 -08:00
Brian Behlendorf 9f80c8e890 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 09:07:05 -08:00
Brian Behlendorf 206edcd3af Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-18 09:07:02 -08:00
Brian Behlendorf 67a0c22eba Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-18 09:07:01 -08:00
Brian Behlendorf a719eb3870 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-18 09:06:59 -08:00
Brian Behlendorf e9e6ad9f78 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:56 -08:00
Brian Behlendorf 233a54ef04 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-18 09:06:54 -08:00
Brian Behlendorf e23b326c79 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:51 -08:00
Brian Behlendorf 9c416cd47f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-18 09:06:49 -08:00
Brian Behlendorf edd6781d0c Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:46 -08:00
Brian Behlendorf 27a9d2f1b9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-18 09:06:45 -08:00
Brian Behlendorf 70048b3471 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:41 -08:00
Brian Behlendorf d7f107e21a Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-18 09:06:39 -08:00
Brian Behlendorf aac5e2181f Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:36 -08:00
Brian Behlendorf a34856dc66 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-18 09:06:35 -08:00
Brian Behlendorf 8922503146 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:32 -08:00
Brian Behlendorf 9cafa3bbd0 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-18 09:06:30 -08:00
Brian Behlendorf efd5865d8c Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:27 -08:00
Brian Behlendorf e7d8dc3064 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-18 09:06:25 -08:00
Brian Behlendorf 25a6359b4c Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:22 -08:00
Brian Behlendorf a8a380dfa5 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-18 09:06:20 -08:00
Brian Behlendorf e7d9b0d1a5 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:17 -08:00
Brian Behlendorf 4ecf6686d0 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-18 09:06:15 -08:00
Brian Behlendorf a83c1c6160 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:12 -08:00
Brian Behlendorf 391f9000dc Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 09:06:10 -08:00
Brian Behlendorf 69c959a5a1 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:07 -08:00
Brian Behlendorf bce797040c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 09:06:06 -08:00
Brian Behlendorf 8a75774b10 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 09:06:05 -08:00
Brian Behlendorf 4340a0b5a9 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-18 09:05:59 -08:00
Brian Behlendorf 00cab20dfb Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-18 09:05:58 -08:00
Brian Behlendorf 1e70a9b85c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 09:05:57 -08:00
Brian Behlendorf ea31d600d6 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-18 09:05:51 -08:00
Brian Behlendorf fe1bd17be7 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 09:05:49 -08:00
Brian Behlendorf de1a9a3fab Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-18 09:05:46 -08:00
Brian Behlendorf 4b8b09bc01 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-18 09:05:45 -08:00
Brian Behlendorf d1c7d0e9ce Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-18 09:05:41 -08:00
Brian Behlendorf c0598f947d Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-18 09:05:40 -08:00
Brian Behlendorf fcb9570af7 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-18 09:05:36 -08:00
Brian Behlendorf b7c69d54ab Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-18 09:05:35 -08:00
Brian Behlendorf b30a32edd3 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-18 09:05:31 -08:00
Brian Behlendorf 12de95cf38 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-18 09:05:30 -08:00
Brian Behlendorf 4a88e4b5ac Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-18 09:05:26 -08:00
Brian Behlendorf ccfe099050 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-18 09:05:25 -08:00
Brian Behlendorf 31f641ff43 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 09:05:21 -08:00
Brian Behlendorf 2df5634cad Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-18 09:05:12 -08:00
Brian Behlendorf 6b7c775e09 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 09:05:11 -08:00
Brian Behlendorf 06c9438f79 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 09:05:10 -08:00