Commit Graph

5747 Commits

Author SHA1 Message Date
Brian Behlendorf 24c4f2e309 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 13:16:50 -08:00
Brian Behlendorf e8066bf2dc Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-19 13:16:49 -08:00
Brian Behlendorf b95f799218 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 13:16:48 -08:00
Brian Behlendorf 28edfc91c8 Add compress header 2008-12-19 13:14:49 -08:00
Brian Behlendorf b366379720 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 12:40:13 -08:00
Brian Behlendorf 83656caeaa Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-19 12:40:11 -08:00
Brian Behlendorf ed16d32847 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-19 12:40:10 -08:00
Brian Behlendorf 2b800ba091 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 12:40:07 -08:00
Brian Behlendorf 338dd65c10 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 12:40:02 -08:00
Brian Behlendorf ee4b20891e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 12:40:01 -08:00
Brian Behlendorf fa45950c1b Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:54 -08:00
Brian Behlendorf b3fafb4b75 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 12:39:52 -08:00
Brian Behlendorf 375226c1d5 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:46 -08:00
Brian Behlendorf e0457c6f15 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 12:39:43 -08:00
Brian Behlendorf 0b776d9f84 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:37 -08:00
Brian Behlendorf 5444e131df Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-19 12:39:35 -08:00
Brian Behlendorf 27d6884354 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:30 -08:00
Brian Behlendorf 3fa69de0ba Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 12:39:28 -08:00
Brian Behlendorf f1d4b64ad0 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:23 -08:00
Brian Behlendorf 4daafd6f1e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 12:39:21 -08:00
Brian Behlendorf 978a02a7e5 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:14 -08:00
Brian Behlendorf 385cabaff9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 12:39:11 -08:00
Brian Behlendorf 16d123e8a9 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:04 -08:00
Brian Behlendorf ca5b279dc4 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 12:39:02 -08:00
Brian Behlendorf 41569454ef Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-19 12:38:57 -08:00
Brian Behlendorf 3406c35fda Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 12:38:55 -08:00
Brian Behlendorf bd7b5b6ad0 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-19 12:38:50 -08:00
Brian Behlendorf df4782cf3b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 12:38:48 -08:00
Brian Behlendorf 9b96601110 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-19 12:38:42 -08:00
Brian Behlendorf d6bcad3544 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 12:38:40 -08:00
Brian Behlendorf f53179120a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 12:38:39 -08:00
Brian Behlendorf 28ed0b18c6 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-19 12:38:30 -08:00
Brian Behlendorf 2b99cc1a0d Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 12:38:27 -08:00
Brian Behlendorf 5f5a7707b5 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 12:38:25 -08:00
Brian Behlendorf 796a362161 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-19 12:38:17 -08:00
Brian Behlendorf 776aad11dd Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 12:38:14 -08:00
Brian Behlendorf af6f07c1aa Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-19 12:38:09 -08:00
Brian Behlendorf 9b07a2a2b2 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 12:38:07 -08:00
Brian Behlendorf 6f141c5c74 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-19 12:38:00 -08:00
Brian Behlendorf 42fd478599 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 12:37:57 -08:00
Brian Behlendorf 05204eac0d Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-19 12:37:50 -08:00
Brian Behlendorf 06a62a8a8c Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 12:37:47 -08:00
Brian Behlendorf 584e1eb884 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-19 12:37:41 -08:00
Brian Behlendorf 7738d0c83d Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-19 12:37:38 -08:00
Brian Behlendorf f50d8dd341 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-19 12:37:32 -08:00
Brian Behlendorf fb259dedce Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-19 12:37:29 -08:00
Brian Behlendorf c2d9428f4c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 12:37:22 -08:00
Brian Behlendorf 3d880713d1 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-19 12:37:18 -08:00
Brian Behlendorf 97818e5e2b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 12:37:17 -08:00
Brian Behlendorf 459f1388ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 12:37:15 -08:00