]> granicus.if.org Git - zfs/commitdiff
Merge branch 'fix-stack-noinline' into refs/top-bases/fix-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 16 Jun 2010 21:35:14 +0000 (14:35 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 16 Jun 2010 21:35:14 +0000 (14:35 -0700)
1  2 
lib/libzpool/include/sys/zfs_context.h
module/zfs/dbuf.c

Simple merge