From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 17 Nov 2014 19:14:24 +0000 (-0800)
Subject: Merge branch 'b_tracepoints'
X-Git-Tag: zfs-0.6.4~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc9f4131a15a177f1d355ad1c5c844e0ab9a505a;p=zfs

Merge branch 'b_tracepoints'

Signed-off-by: Prakash Surya <surya1@llnl.gov>
Signed-off-by: Ned Bass <bass6@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2874
---

bc9f4131a15a177f1d355ad1c5c844e0ab9a505a