]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Tue, 6 Jan 2009 22:58:22 +0000 (09:58 +1100)
committerJames Morris <jmorris@namei.org>
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