]> git.proxmox.com Git - mirror_zfs-debian.git/commitdiff
projects / mirror_zfs-debian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54a179e 037849f)
Merge branch 'zpl'
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 18 Feb 2011 17:31:25 +0000 (09:31 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 18 Feb 2011 17:31:25 +0000 (09:31 -0800)
1  2 
module/zfs/dmu_objset.c patch | diff1 | diff2 | blob | history

diff --cc module/zfs/dmu_objset.c
Simple merge
Mirror of ZFSOnLinux for Debian