From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 6 Nov 2012 22:48:33 +0000 (-0800)
Subject: Merge remote branch 'eris/stats'
X-Git-Tag: spl-0.6.0-rc12~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87efc30b270454a372e18f236491b4f0e5bcc30d;p=spl

Merge remote branch 'eris/stats'

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>
---

87efc30b270454a372e18f236491b4f0e5bcc30d