commit | aeda4ac3efc29e4d55989abd0a73530453aa69ba | [log] [tgz] |
---|---|---|
author | James Morris <jmorris@namei.org> | Mon Jan 10 10:40:42 2011 +1100 |
committer | James Morris <jmorris@namei.org> | Mon Jan 10 10:40:42 2011 +1100 |
tree | 35b3d2cca8bfb49cf08bf1c6b55b586c1e5971e7 | |
parent | d2e7ad19229f982fc1eb731827d82ceac90abfb3 [diff] | |
parent | 350e4f31e0eaf56dfc3b328d24a11bdf42a41fb8 [diff] |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next