]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Wed, 8 Jan 2014 06:22:32 +0000 (17:22 +1100)
committerJames Morris <james.l.morris@oracle.com>
Wed, 8 Jan 2014 06:22:32 +0000 (17:22 +1100)

Trivial merge