Commit Graph

19823 Commits

Author SHA1 Message Date
Brian Behlendorf 7410d21dc7 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-09 14:17:32 -08:00
Brian Behlendorf 29ed19d74b Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-09 14:17:28 -08:00
Brian Behlendorf 6f43a354a1 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-09 14:17:27 -08:00
Brian Behlendorf fc848d7971 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-09 14:17:24 -08:00
Brian Behlendorf 6463b7cb09 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-09 14:17:23 -08:00
Brian Behlendorf 7696aa2463 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-09 14:17:22 -08:00
Brian Behlendorf 107ae5f0f3 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-09 14:17:17 -08:00
Brian Behlendorf a908673a43 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-09 14:17:15 -08:00
Brian Behlendorf 342eb7ef4e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-09 14:17:15 -08:00
Brian Behlendorf dfdaa8b15a Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-09 14:17:09 -08:00
Brian Behlendorf 2626a4d563 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-09 14:17:08 -08:00
Brian Behlendorf 01a5da6abb Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-09 14:17:04 -08:00
Brian Behlendorf 48c7f0c129 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-09 14:17:03 -08:00
Brian Behlendorf bf51da1277 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-09 14:17:00 -08:00
Brian Behlendorf d3b6c485ca Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-09 14:16:59 -08:00
Brian Behlendorf 716b734da5 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-09 14:16:55 -08:00
Brian Behlendorf 4768609122 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-09 14:16:54 -08:00
Brian Behlendorf 996a11351a Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-09 14:16:51 -08:00
Brian Behlendorf e2420b42cb Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-09 14:16:49 -08:00
Brian Behlendorf 5730c62406 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-09 14:16:46 -08:00
Brian Behlendorf 93aaa0869a Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-09 14:16:45 -08:00
Brian Behlendorf b569329a77 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-09 14:16:42 -08:00
Brian Behlendorf 5982604a16 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-09 14:16:40 -08:00
Brian Behlendorf 36d7762781 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-09 14:16:39 -08:00
Brian Behlendorf 19f58048cb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-09 14:16:39 -08:00
Brian Behlendorf 12dc44dced Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-09 14:16:38 -08:00
Brian Behlendorf 7d897127c1 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2008-12-09 14:16:38 -08:00
Brian Behlendorf da9682b967 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-09 14:16:37 -08:00
Brian Behlendorf 8795b4a264 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-09 14:16:36 -08:00
Brian Behlendorf 0416158844 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-09 14:16:36 -08:00
Brian Behlendorf c4ca3271cc Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-09 14:16:34 -08:00
Brian Behlendorf 7738478130 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-09 14:16:34 -08:00
Brian Behlendorf abc04c23a5 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2008-12-09 14:16:33 -08:00
Brian Behlendorf 627f9a3296 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2008-12-09 14:16:33 -08:00
Brian Behlendorf cb0aaaa29c Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-09 14:16:32 -08:00
Brian Behlendorf fdefb041a7 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-09 14:16:31 -08:00
Brian Behlendorf 85d4ea4cb0 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-09 14:16:30 -08:00
Brian Behlendorf 3e74668176 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2008-12-09 14:16:30 -08:00
Brian Behlendorf a5c7500d30 Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-09 14:16:29 -08:00
Brian Behlendorf 28a4cb140c Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-09 14:16:29 -08:00
Brian Behlendorf 9f57596c78 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2008-12-09 14:16:28 -08:00
Brian Behlendorf 4358d79285 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-09 14:16:27 -08:00
Brian Behlendorf d4b8a48f81 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-09 14:16:26 -08:00
Brian Behlendorf ad09e624d8 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2008-12-09 14:16:26 -08:00
Brian Behlendorf 10e68eee41 Merge branch 'fix-locks' into refs/top-bases/fix-branch 2008-12-09 14:16:25 -08:00
Brian Behlendorf ed67495146 Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-09 14:16:24 -08:00
Brian Behlendorf ac4e8d7252 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-09 14:16:23 -08:00
Brian Behlendorf e24c9ae6d4 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2008-12-09 14:16:23 -08:00
Brian Behlendorf 34fe60deca Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-09 14:16:22 -08:00
Brian Behlendorf 63f396db56 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2008-12-09 14:16:22 -08:00