Commit Graph

5800 Commits

Author SHA1 Message Date
Brian Behlendorf 7b4de8a241 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-22 09:11:58 -08:00
Brian Behlendorf 1a8afb52ae Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-22 09:11:57 -08:00
Brian Behlendorf e959b03a8e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 09:11:54 -08:00
Brian Behlendorf 8c1397561c Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-22 09:11:51 -08:00
Brian Behlendorf 98810ac9fb Update zpool Makefile 2008-12-22 09:10:00 -08:00
Brian Behlendorf cb859a27ba Add librt for clock_gettime 2008-12-22 09:06:24 -08:00
Brian Behlendorf 4be52c90f1 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-19 17:04:56 -08:00
Brian Behlendorf b4b2f9061c Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 17:04:53 -08:00
Brian Behlendorf 0a2b72dd25 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 17:04:46 -08:00
Brian Behlendorf 842e46cdbb Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 17:04:43 -08:00
Brian Behlendorf 06aa07712f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-19 17:04:36 -08:00
Brian Behlendorf 329d309e24 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 17:04:33 -08:00
Brian Behlendorf c91e30eae4 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 17:04:26 -08:00
Brian Behlendorf 0f083e890f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 17:04:23 -08:00
Brian Behlendorf 238f0b466b Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-19 17:04:16 -08:00
Brian Behlendorf 5a64ce09cc Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-19 17:04:13 -08:00
Brian Behlendorf 8d6d60e5ac Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-19 17:04:06 -08:00
Brian Behlendorf 7e92ed1fd2 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 17:04:03 -08:00
Brian Behlendorf 79e202d12f Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-19 17:03:56 -08:00
Brian Behlendorf b6628d7448 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 17:03:53 -08:00
Brian Behlendorf 508b956795 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 17:03:46 -08:00
Brian Behlendorf fb0edb1ad7 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 17:03:44 -08:00
Brian Behlendorf 073f62d660 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-19 17:03:40 -08:00
Brian Behlendorf d9965a52fe Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 17:03:38 -08:00
Brian Behlendorf 8ca5683f98 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-19 17:03:32 -08:00
Brian Behlendorf f07b512c8e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 17:03:28 -08:00
Brian Behlendorf d39f64472f Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-19 17:03:22 -08:00
Brian Behlendorf b372f0554f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 17:03:19 -08:00
Brian Behlendorf 38da2b41eb Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-19 17:03:14 -08:00
Brian Behlendorf 96f6431efb Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 17:03:11 -08:00
Brian Behlendorf c5e0b09f2c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 17:03:10 -08:00
Brian Behlendorf 383946ab6f Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-19 17:03:00 -08:00
Brian Behlendorf 531a4a1119 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 17:02:57 -08:00
Brian Behlendorf 7afce80eb8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 17:02:56 -08:00
Brian Behlendorf 755be9ee3a Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-19 17:02:46 -08:00
Brian Behlendorf 61f6939850 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 17:02:43 -08:00
Brian Behlendorf 48f558ff01 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-19 17:02:38 -08:00
Brian Behlendorf d8fa94ec98 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 17:02:35 -08:00
Brian Behlendorf 9dfeaada21 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-19 17:02:28 -08:00
Brian Behlendorf 4ef72baea9 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 17:02:25 -08:00
Brian Behlendorf 5474600eff Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-19 17:02:19 -08:00
Brian Behlendorf 0a53a422b3 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 17:02:16 -08:00
Brian Behlendorf 8400884040 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-19 17:02:10 -08:00
Brian Behlendorf 246dac5284 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-19 17:02:06 -08:00
Brian Behlendorf 8e6c50e93e Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-19 17:02:02 -08:00
Brian Behlendorf 08ff5d9d38 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-19 17:01:58 -08:00
Brian Behlendorf 35336f33ee Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 17:01:54 -08:00
Brian Behlendorf f20a766d09 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-19 17:01:50 -08:00
Brian Behlendorf c8ad9946dc use zlib 2008-12-19 16:58:20 -08:00
Brian Behlendorf 211c08ef19 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-19 16:57:53 -08:00