Merge tag 'v3.6-rc2' into next
authorJames Morris <james.l.morris@oracle.com>
Fri, 17 Aug 2012 10:42:30 +0000 (20:42 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 17 Aug 2012 10:42:30 +0000 (20:42 +1000)
Linux 3.6-rc2

Resync with Linus.


Trivial merge