Linus Torvalds de0a5345a5 Merge branch 'for-linus' of git://github.com/richardweinberger/linux ... * 'for-linus' of git://github.com/richardweinberger/linux: (90 commits) um: fix ubd cow size um: Fix kmalloc argument order in um/vdso/vma.c um: switch to use of drivers/Kconfig UserModeLinux-HOWTO.txt: fix a typo UserModeLinux-HOWTO.txt: remove ^H characters um: we need sys/user.h only on i386 um: merge delay_{32,64}.c um: distribute exports to where exported stuff is defined um: kill system-um.h um: generic ftrace.h will do... um: segment.h is x86-only and needed only there um: asm/pda.h is not needed anymore um: hw_irq.h can go generic as well um: switch to generic-y um: clean Kconfig up a bit um: a couple of missing dependencies... um: kill useless argument of free_chan() and free_one_chan() um: unify ptrace_user.h um: unify KSTK_... um: fix gcov build breakage ...		2011-11-02 09:45:39 -07:00
..
apparmor	apparmor: sparse fix: include procattr.h in procattr.c	2011-09-09 16:56:29 -07:00
integrity	Merge branch 'for-linus' of git://github.com/richardweinberger/linux	2011-11-02 09:45:39 -07:00
keys	security: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
selinux	selinux: sparse fix: fix several warnings in the security server code	2011-09-09 16:56:32 -07:00
smack	Smack: allow to access /smack/access as normal user	2011-10-20 16:07:31 -07:00
tomoyo	Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security	2011-10-25 09:45:31 +02:00
capability.c	->permission() sanitizing: don't pass flags to ->inode_permission()	2011-07-20 01:43:26 -04:00
commoncap.c	capabilities: initialize has_cap	2011-08-16 09:20:45 +10:00
device_cgroup.c	security,rcu: Convert call_rcu(whitelist_item_free) to kfree_rcu()	2011-07-20 11:05:30 -07:00
inode.c
Kconfig	encrypted-keys: remove trusted-keys dependency	2011-09-14 15:23:49 -04:00
lsm_audit.c
Makefile	integrity: move ima inode integrity data management	2011-07-18 12:29:38 -04:00
min_addr.c
security.c	Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security	2011-10-25 09:45:31 +02:00