Commit Graph

7690 Commits

Author SHA1 Message Date
Brian Behlendorf 0939594436 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-09 12:50:15 -08:00
Brian Behlendorf b77b7a4741 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-09 12:50:10 -08:00
Brian Behlendorf 66a5203c13 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-09 12:50:01 -08:00
Brian Behlendorf 3a7eb61188 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-09 12:49:56 -08:00
Brian Behlendorf b28b027c24 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-09 12:49:50 -08:00
Brian Behlendorf a0c50d8932 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-09 12:49:44 -08:00
Brian Behlendorf 2f823ccc56 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-09 12:49:38 -08:00
Brian Behlendorf 6ac9aa7c64 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-09 12:49:34 -08:00
Brian Behlendorf cb45b9022b Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-09 12:49:27 -08:00
Brian Behlendorf 741b7a18ac Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 12:49:24 -08:00
Brian Behlendorf 24f4f78b68 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-09 12:49:18 -08:00
Brian Behlendorf 613eaeb74b Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-09 12:49:14 -08:00
Brian Behlendorf 0e91a7c365 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-09 12:49:07 -08:00
Brian Behlendorf 0963498e86 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-09 12:49:00 -08:00
Brian Behlendorf 2692d5b013 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-09 12:48:53 -08:00
Brian Behlendorf 786b3d6b88 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 12:48:49 -08:00
Brian Behlendorf 9367cf685c Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-09 12:48:39 -08:00
Brian Behlendorf 6e62e110c3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 12:48:35 -08:00
Brian Behlendorf 9199436355 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 12:48:34 -08:00
Brian Behlendorf 460d81ae35 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 12:48:24 -08:00
Brian Behlendorf fb1f1596c7 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 12:48:19 -08:00
Brian Behlendorf 18f3ecb485 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 12:48:17 -08:00
Brian Behlendorf 92c0040a2c Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-09 12:48:07 -08:00
Brian Behlendorf dd7026b1e4 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-09 12:48:02 -08:00
Brian Behlendorf 2ffac82213 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-09 12:47:55 -08:00
Brian Behlendorf 5a3d630abc Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-09 12:47:48 -08:00
Brian Behlendorf 4b2a2b09c2 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-09 12:47:42 -08:00
Brian Behlendorf 09f5931013 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-09 12:47:37 -08:00
Brian Behlendorf 20e06ba280 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-09 12:47:32 -08:00
Brian Behlendorf ea3a11c275 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-09 12:47:28 -08:00
Brian Behlendorf cf7b2abac3 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-09 12:47:22 -08:00
Brian Behlendorf 7b9fb1850a Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-09 12:47:16 -08:00
Brian Behlendorf 60c3dbbb3e Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-09 12:47:10 -08:00
Brian Behlendorf f009e8e343 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-09 12:47:04 -08:00
Brian Behlendorf f5a274607e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 12:46:56 -08:00
Brian Behlendorf 97ad681fc7 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-09 12:46:46 -08:00
Brian Behlendorf 129afe3ce8 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-09 12:46:44 -08:00
Brian Behlendorf b4d27767d8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-09 12:46:42 -08:00
Brian Behlendorf d64233083d Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-09 12:46:41 -08:00
Brian Behlendorf b3064162aa Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-01-09 12:46:40 -08:00
Brian Behlendorf cb5fc9440b Remove extra defaults 2009-01-09 12:42:27 -08:00
Brian Behlendorf 72354d1c58 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-09 11:44:51 -08:00
Brian Behlendorf e2e5e6e16a Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 11:44:49 -08:00
Brian Behlendorf 3b50940546 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-09 11:44:46 -08:00
Brian Behlendorf a18eb3cc93 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 11:44:43 -08:00
Brian Behlendorf 2735cd4ab1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 11:44:43 -08:00
Brian Behlendorf 3bed287e00 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 11:44:37 -08:00
Brian Behlendorf 37cdc79b95 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 11:44:34 -08:00
Brian Behlendorf f0f1f7362d Remove invalid tunable 2009-01-09 11:42:31 -08:00
Brian Behlendorf 06fb918065 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-09 11:32:50 -08:00