]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <james.l.morris@oracle.com>
Tue, 22 Nov 2016 22:52:11 +0000 (09:52 +1100)
committerJames Morris <james.l.morris@oracle.com>
Tue, 22 Nov 2016 22:52:11 +0000 (09:52 +1100)

Trivial merge