projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4a82a4 8ed8146)
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
Linux Kernel tree with some unpolished code for Colibri/Apalis modules