]> git.proxmox.com Git - mirror_spl.git/commitdiff
Merge remote branch 'eris/stats'
authorBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 6 Nov 2012 22:48:33 +0000 (14:48 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 6 Nov 2012 22:48:43 +0000 (14:48 -0800)
Bring in support for the new KSTAT_TYPE_TXG type.  This allows for
additional visibility in to the txg handling.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

Trivial merge