Commit Graph

5402 Commits

Author SHA1 Message Date
Brian Behlendorf 14851312ec Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-18 10:07:32 -08:00
Brian Behlendorf 058af4d43a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-18 10:07:30 -08:00
Brian Behlendorf 97b1c291e9 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-18 10:07:27 -08:00
Brian Behlendorf 36d0cc488f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-18 10:07:25 -08:00
Brian Behlendorf 4ee152896d Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-18 10:07:22 -08:00
Brian Behlendorf 3fa5220373 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-18 10:07:21 -08:00
Brian Behlendorf 5ef411ff2e Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-18 10:07:17 -08:00
Brian Behlendorf 4d834b9415 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-18 10:07:16 -08:00
Brian Behlendorf 858cb7de59 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 10:07:13 -08:00
Brian Behlendorf 36198eda31 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-18 10:07:11 -08:00
Brian Behlendorf 064910dd06 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-18 10:07:08 -08:00
Brian Behlendorf b2c4e56a4f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-18 10:07:06 -08:00
Brian Behlendorf f2a293e2a8 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-18 10:07:03 -08:00
Brian Behlendorf 2ea3f11b9e Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-18 10:07:01 -08:00
Brian Behlendorf 5ca4c06010 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-18 10:06:58 -08:00
Brian Behlendorf d4787b52b6 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-18 10:06:56 -08:00
Brian Behlendorf 3d4997e4bb Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-18 10:06:53 -08:00
Brian Behlendorf 63249028a8 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 10:06:52 -08:00
Brian Behlendorf 905ea4bb26 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-18 10:06:48 -08:00
Brian Behlendorf 88ad31655c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 10:06:47 -08:00
Brian Behlendorf 57d4abfe7a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 10:06:46 -08:00
Brian Behlendorf a6588a6c4e Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-18 10:06:41 -08:00
Brian Behlendorf 819921a351 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-18 10:06:39 -08:00
Brian Behlendorf cf126a8e16 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 10:06:38 -08:00
Brian Behlendorf 685aa9a047 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-18 10:06:33 -08:00
Brian Behlendorf 15418e802e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 10:06:31 -08:00
Brian Behlendorf 2823ae5548 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-18 10:06:28 -08:00
Brian Behlendorf 79255f4735 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-18 10:06:26 -08:00
Brian Behlendorf 4b1538ca99 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-18 10:06:23 -08:00
Brian Behlendorf 7ac8ec2ba9 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-18 10:06:22 -08:00
Brian Behlendorf 667506e2d8 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-18 10:06:18 -08:00
Brian Behlendorf d0f89969c4 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-18 10:06:17 -08:00
Brian Behlendorf b79895a162 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-18 10:06:14 -08:00
Brian Behlendorf 197a716837 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-18 10:06:12 -08:00
Brian Behlendorf 2aa9c29693 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-18 10:06:09 -08:00
Brian Behlendorf 27efe12078 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-18 10:06:07 -08:00
Brian Behlendorf 075674f079 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 10:06:04 -08:00
Brian Behlendorf 82581f67b0 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-18 10:06:02 -08:00
Brian Behlendorf 5c7ee1347b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 10:06:01 -08:00
Brian Behlendorf c00d7dde6d Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-18 10:06:00 -08:00
Brian Behlendorf 012ce813df Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-18 10:06:00 -08:00
Brian Behlendorf e4d1734eb1 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-18 10:05:59 -08:00
Brian Behlendorf 432399da0f Add dropping written variable declaration 2008-12-18 10:03:57 -08:00
Brian Behlendorf d0b184979c Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-18 10:03:21 -08:00
Brian Behlendorf 00aa17c6b3 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-18 10:03:20 -08:00
Brian Behlendorf 552fb25a4f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-18 10:03:17 -08:00
Brian Behlendorf 16dc43525b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-18 10:03:15 -08:00
Brian Behlendorf 85d0c2f354 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-18 10:03:12 -08:00
Brian Behlendorf 6e07ae82ea Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-18 10:03:10 -08:00
Brian Behlendorf ef01ab78ce Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-18 10:03:07 -08:00