| commit | b7b57551bbda1390959207f79f2038aa7adb72ae | |
| author | James Morris <jmorris@namei.org> | |
| Tue, 24 May 2011 13:20:19 +0000 (24 23:20 +1000) | ||
| committer | James Morris <jmorris@namei.org> | |
| Tue, 24 May 2011 13:20:19 +0000 (24 23:20 +1000) | ||
| tree | d591a08e7e45615b51d8b5ee1634a29920f62c3f | treesnapshot (tar.gz zip) |
| parent | 434d42cfd05a7cc452457a81d2029540cba12150 | commitdiff |
| parent | 7a627e3b9a2bd0f06945bbe64bcf403e788ecf6e | commitdiff |
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>
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>