tree 61b1d0eb6ae6059e879571517a0f36bcffdabf34
parent 60b8b1de0dd2bf246f0e074d287bb3f0bc42a755
parent ded509880f6a0213b09f8ae7bef84acb16eaccbf
author James Morris <jmorris@namei.org> 1308094908 +1000
committer James Morris <jmorris@namei.org> 1308094908 +1000

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