Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <james.l.morris@oracle.com>
Fri, 12 Sep 2014 12:40:22 +0000 (22:40 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 12 Sep 2014 12:40:22 +0000 (22:40 +1000)

Trivial merge