Merge branch 'linux-3.6'
authorBrian Behlendorf <behlendorf1@llnl.gov>
Sun, 14 Oct 2012 23:27:22 +0000 (16:27 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Sun, 14 Oct 2012 23:32:17 +0000 (16:32 -0700)
commitee7913b644a2c812a249046f56eed39d1977d706
tree6bea5a895ae24d30f78260a8bf16fc24254cc015
parenta5c20e2a0a9046c06d86615fbf51dc04f12bba14
parent95f5c63b47d8f8294b38843f9ba710e97b749b63
Merge branch 'linux-3.6'

This branch adds the required compatibility code to support the
Linux 3.6 kernel.

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