Merge branch 'master' into next
James Morris [Sun, 17 Jan 2010 22:56:22 +0000 (09:56 +1100)]
1  2 
include/linux/security.h
security/selinux/ss/services.c
security/tomoyo/file.c

Simple merge
Simple merge
Simple merge