tree b0ba42fb54cd05178c61584e0913be38a57f0384
parent 609cfda586c7fe3e5d1a02c51edb587506294167
parent bf69d41d198138e3c601e9a6645f4f1369aff7e0
author James Morris <jmorris@namei.org> 1304474374 +1000
committer James Morris <jmorris@namei.org> 1304474374 +1000

Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus