| commit | 6f239284542bae297d27355d06afbb8df23c5db9 | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Wed May 04 11:59:34 2011 +1000 |
| committer | James Morris <jmorris@namei.org> | Wed May 04 11:59:34 2011 +1000 |
| tree | b0ba42fb54cd05178c61584e0913be38a57f0384 | |
| parent | 609cfda586c7fe3e5d1a02c51edb587506294167 [diff] | |
| parent | bf69d41d198138e3c601e9a6645f4f1369aff7e0 [diff] |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus