Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <james.l.morris@oracle.com>
Thu, 18 Jun 2015 13:28:40 +0000 (23:28 +1000)
committerJames Morris <james.l.morris@oracle.com>
Thu, 18 Jun 2015 13:28:40 +0000 (23:28 +1000)

Trivial merge