| commit | 82b88bb24e28dd4fb4bec30e75412f41326130f0 | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Wed Jun 15 09:41:48 2011 +1000 |
| committer | James Morris <jmorris@namei.org> | Wed Jun 15 09:41:48 2011 +1000 |
| tree | 61b1d0eb6ae6059e879571517a0f36bcffdabf34 | |
| parent | 60b8b1de0dd2bf246f0e074d287bb3f0bc42a755 [diff] | |
| parent | ded509880f6a0213b09f8ae7bef84acb16eaccbf [diff] |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus