From: James Morris <james.l.morris@oracle.com>
Date: Wed, 8 Jan 2014 06:22:32 +0000 (+1100)
Subject: Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next
X-Git-Tag: next-20140109~37^2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=923b49ff69fcbffe6f8b2739de218c45544392a7

Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next
---

923b49ff69fcbffe6f8b2739de218c45544392a7