Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <james.l.morris@oracle.com>
Wed, 29 Oct 2014 04:03:54 +0000 (15:03 +1100)
committerJames Morris <james.l.morris@oracle.com>
Wed, 29 Oct 2014 04:03:54 +0000 (15:03 +1100)

Trivial merge