Merge branch 'next' into for-linus
James Morris [Tue, 6 Jan 2009 22:58:22 +0000 (09:58 +1100)]
1  2 
Documentation/feature-removal-schedule.txt
include/linux/security.h
kernel/capability.c
security/commoncap.c
security/security.c
security/selinux/selinuxfs.c
security/smack/smack_lsm.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge