diff options
| author | James Morris <jmorris@namei.org> | 2011-05-24 15:20:19 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-05-24 15:20:19 +0200 |
| commit | b7b57551bbda1390959207f79f2038aa7adb72ae (patch) | |
| tree | d591a08e7e45615b51d8b5ee1634a29920f62c3f /drivers/thermal/Kconfig | |
| parent | Merge branch 'next' into for-linus (diff) | |
| parent | SELINUX: add /sys/fs/selinux mount point to put selinuxfs (diff) | |
| download | linux-b7b57551bbda1390959207f79f2038aa7adb72ae.tar.xz linux-b7b57551bbda1390959207f79f2038aa7adb72ae.zip | |
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>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions