Linus Torvalds c49c41a413 Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security ... * 'for-linus' of git://selinuxproject.org/~jmorris/linux-security: capabilities: remove __cap_full_set definition security: remove the security_netlink_recv hook as it is equivalent to capable() ptrace: do not audit capability check when outputing /proc/pid/stat capabilities: remove task_ns_* functions capabitlies: ns_capable can use the cap helpers rather than lsm call capabilities: style only - move capable below ns_capable capabilites: introduce new has_ns_capabilities_noaudit capabilities: call has_ns_capability from has_capability capabilities: remove all _real_ interfaces capabilities: introduce security_capable_noaudit capabilities: reverse arguments to security_capable capabilities: remove the task from capable LSM hook entirely selinux: sparse fix: fix several warnings in the security server cod selinux: sparse fix: fix warnings in netlink code selinux: sparse fix: eliminate warnings for selinuxfs selinux: sparse fix: declare selinux_disable() in security.h selinux: sparse fix: move selinux_complete_init selinux: sparse fix: make selinux_secmark_refcount static SELinux: Fix RCU deref check warning in sel_netport_insert() Manually fix up a semantic mis-merge wrt security_netlink_recv(): - the interface was removed in commit fd77846152 ("security: remove the security_netlink_recv hook as it is equivalent to capable()") - a new user of it appeared in commit a38f7907b9 ("crypto: Add userspace configuration API") causing no automatic merge conflict, but Eric Paris pointed out the issue.		2012-01-14 18:36:33 -08:00
..
acpi	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
asm-generic	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -08:00
crypto
drm	drm: bump DRM_CONNECTOR_MAX_ENCODER from 2 to 3	2012-01-13 09:01:09 +00:00
keys
linux	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
math-emu
media	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
misc
mtd	mtd: document that MEMWRITE ioctl is NAND-specific	2012-01-09 18:18:36 +00:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-01-12 20:30:02 -08:00
pcmcia
rdma	rdma/core: Fix sparse warnings	2012-01-04 09:17:45 -08:00
rxrpc
scsi	SCSI updates for post 3.2 merge window	2012-01-10 10:36:08 -08:00
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
target
trace	vmscan/trace: Add 'file' info to trace_mm_vmscan_lru_isolate()	2012-01-12 20:13:08 -08:00
video	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -08:00
xen	Merge branch 'stable/for-linus-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2012-01-10 10:09:59 -08:00
Kbuild