Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <jmorris@namei.org>
Sun, 10 Jan 2016 10:52:17 +0000 (21:52 +1100)
committerJames Morris <james.l.morris@oracle.com>
Sun, 10 Jan 2016 10:52:17 +0000 (21:52 +1100)

Trivial merge