]> granicus.if.org Git - spl/commitdiff
Merge branch 'linux-3.10'
authorBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 8 Jul 2013 22:26:59 +0000 (15:26 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 8 Jul 2013 22:27:32 +0000 (15:27 -0700)
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #257


Trivial merge