summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-securityLinus Torvalds2012-01-1424-189/+120
|\
| * capabilities: remove __cap_full_set definitionEric Paris2012-01-051-1/+0
| * security: remove the security_netlink_recv hook as it is equivalent to capable()Eric Paris2012-01-0514-58/+10
| * ptrace: do not audit capability check when outputing /proc/pid/statEric Paris2012-01-054-6/+15
| * capabilities: remove task_ns_* functionsEric Paris2012-01-055-20/+7
| * capabitlies: ns_capable can use the cap helpers rather than lsm callEric Paris2012-01-051-1/+1
| * capabilities: style only - move capable below ns_capableEric Paris2012-01-051-16/+16
| * capabilites: introduce new has_ns_capabilities_noauditEric Paris2012-01-052-5/+27
| * capabilities: call has_ns_capability from has_capabilityEric Paris2012-01-051-16/+10
| * capabilities: remove all _real_ interfacesEric Paris2012-01-053-52/+15
| * capabilities: introduce security_capable_noauditEric Paris2012-01-052-0/+13
| * capabilities: reverse arguments to security_capableEric Paris2012-01-054-6/+6
| * capabilities: remove the task from capable LSM hook entirelyEric Paris2012-01-055-39/+31
| * selinux: sparse fix: fix several warnings in the security server codJames Morris2012-01-055-7/+9
| * selinux: sparse fix: fix warnings in netlink codeJames Morris2012-01-056-5/+6
| * selinux: sparse fix: eliminate warnings for selinuxfsJames Morris2012-01-053-6/+4
| * selinux: sparse fix: declare selinux_disable() in security.hJames Morris2012-01-052-1/+1
| * selinux: sparse fix: move selinux_complete_initJames Morris2012-01-052-1/+1
| * selinux: sparse fix: make selinux_secmark_refcount staticJames Morris2012-01-051-1/+1
| * SELinux: Fix RCU deref check warning in sel_netport_insert()David Howells2011-12-201-1/+3
* | Merge tag 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarina...Linus Torvalds2012-01-145-28/+155
|\ \
| * | kmemleak: Add support for memory hotplugLaura Abbott2011-12-022-3/+5
| * | kmemleak: Handle percpu memory allocationCatalin Marinas2011-12-024-1/+94
| * | kmemleak: Report previously found leaks even after an errorCatalin Marinas2011-12-021-9/+13
| * | kmemleak: When the early log buffer is exceeded, report the actual numberCatalin Marinas2011-12-021-6/+15
| * | kmemleak: Show where early_log issues come fromCatalin Marinas2011-12-021-9/+28
* | | Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headersLinus Torvalds2012-01-1425-93/+92
|\ \ \
| * | | UAPI: Split trivial #if defined(__KERNEL__) && X conditionalsDavid Howells2011-12-138-18/+40
| * | | UAPI: Don't have a #elif clause in a __KERNEL__ guard in linux/soundcard.hDavid Howells2011-12-131-1/+3
| * | | UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removedDavid Howells2011-12-131-0/+3
| * | | UAPI: Make linux/patchkey.h easier to parseDavid Howells2011-12-131-1/+3
| * | | UAPI: Fix nested __KERNEL__ guards in video/edid.hDavid Howells2011-12-131-4/+2
| * | | UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitterDavid Howells2011-12-132-2/+2
| * | | UAPI: Guard linux/cuda.hDavid Howells2011-12-131-0/+5
| * | | UAPI: Guard linux/pmu.hDavid Howells2011-12-131-0/+4
| * | | UAPI: Guard linux/isdn_divertif.hDavid Howells2011-12-131-0/+4
| * | | UAPI: Guard linux/sound.hDavid Howells2011-12-131-0/+4
| * | | UAPI: Rearrange definition of HZ in asm-generic/param.hDavid Howells2011-12-131-6/+7
| * | | UAPI: Make FRV use asm-generic/param.hDavid Howells2011-12-121-15/+1
| * | | UAPI: Make M32R use asm-generic/param.hDavid Howells2011-12-121-17/+1
| * | | UAPI: Make MN10300 use asm-generic/param.hDavid Howells2011-12-121-17/+1
| * | | UAPI: elf_read_implies_exec() is a kernel-only feature - so hide from userspaceDavid Howells2011-12-121-9/+9
| * | | UAPI: Don't include linux/compat.h in sparc's asm/siginfo.hDavid Howells2011-12-121-2/+0
| * | | UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y linesDavid Howells2011-12-121-1/+3
* | | | fsnotify: don't BUG in fsnotify_destroy_mark()Miklos Szeredi2012-01-141-3/+5
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ros...Linus Torvalds2012-01-141-12/+40
|\ \ \ \
| * | | | kconfig/streamline-config.pl: Fix parsing Makefile with variablesSteven Rostedt2012-01-131-0/+29
| * | | | kconfig/streamline-config.pl: Simplify backslash line concatinationSteven Rostedt2012-01-131-13/+12
* | | | | Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6Linus Torvalds2012-01-14102-5469/+6285
|\ \ \ \ \
| * | | | | module_param: make bool parameters really bool (drivers/video/i810)Rusty Russell2012-01-121-5/+5
OpenPOWER on IntegriCloud