| commit | b7b57551bbda1390959207f79f2038aa7adb72ae | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Tue May 24 23:20:19 2011 +1000 |
| committer | James Morris <jmorris@namei.org> | Tue May 24 23:20:19 2011 +1000 |
| tree | d591a08e7e45615b51d8b5ee1634a29920f62c3f | |
| parent | 434d42cfd05a7cc452457a81d2029540cba12150 [diff] | |
| parent | 7a627e3b9a2bd0f06945bbe64bcf403e788ecf6e [diff] |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus Conflicts: lib/flex_array.c security/selinux/avc.c security/selinux/hooks.c security/selinux/ss/policydb.c security/smack/smack_lsm.c Manually resolve conflicts. Signed-off-by: James Morris <jmorris@namei.org>