From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 8 Jul 2013 22:26:59 +0000 (-0700)
Subject: Merge branch 'linux-3.10'
X-Git-Tag: spl-0.6.2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bc941f3cd1142abc3d7d2261a7a077bfe949367;p=spl

Merge branch 'linux-3.10'

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

5bc941f3cd1142abc3d7d2261a7a077bfe949367