Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <james.l.morris@oracle.com>
Tue, 16 Dec 2014 01:49:10 +0000 (12:49 +1100)
committerJames Morris <james.l.morris@oracle.com>
Tue, 16 Dec 2014 01:49:10 +0000 (12:49 +1100)

Trivial merge