Merge branch 'for-Linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <james.l.morris@oracle.com>
Mon, 7 Jan 2013 01:11:37 +0000 (12:11 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 7 Jan 2013 01:11:37 +0000 (12:11 +1100)
Pulled from Mimi's tree.


Trivial merge