Merge tag 'yama-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux...
authorJames Morris <james.l.morris@oracle.com>
Tue, 3 Mar 2015 08:56:08 +0000 (19:56 +1100)
committerJames Morris <james.l.morris@oracle.com>
Tue, 3 Mar 2015 08:56:08 +0000 (19:56 +1100)

Trivial merge