Merge branch 'tomoyo-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...
authorJames Morris <james.l.morris@oracle.com>
Mon, 13 Apr 2015 02:07:47 +0000 (12:07 +1000)
committerJames Morris <james.l.morris@oracle.com>
Mon, 13 Apr 2015 02:07:47 +0000 (12:07 +1000)

Trivial merge