Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <james.l.morris@oracle.com>
Sat, 26 Dec 2015 05:06:53 +0000 (16:06 +1100)
committerJames Morris <james.l.morris@oracle.com>
Sat, 26 Dec 2015 05:06:53 +0000 (16:06 +1100)

Trivial merge