Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Sun, 17 Jan 2010 22:56:22 +0000 (09:56 +1100)
committerJames Morris <jmorris@namei.org>
Sun, 17 Jan 2010 22:56:22 +0000 (09:56 +1100)
commit2457552d1e6f3183cd93f81c49a8da5fe8bb0e42
tree7ca46caa910012d75617700e4083b3657053cb31
parent19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc
parent6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971
Merge branch 'master' into next
include/linux/security.h
security/selinux/ss/services.c
security/tomoyo/file.c