You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) fs: Merge split strings treewide: fix potentially dangerous trailing ';' in #defined values/expressions uwb: Fix misspelling of neighbourhood in comment net, netfilter: Remove redundant goto in ebt_ulog_packet trivial: don't touch files that are removed in the staging tree lib/vsprintf: replace link to Draft by final RFC number doc: Kconfig: `to be' -> `be' doc: Kconfig: Typo: square -> squared doc: Konfig: Documentation/power/{pm => apm-acpi}.txt drivers/net: static should be at beginning of declaration drivers/media: static should be at beginning of declaration drivers/i2c: static should be at beginning of declaration XTENSA: static should be at beginning of declaration SH: static should be at beginning of declaration MIPS: static should be at beginning of declaration ARM: static should be at beginning of declaration rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check Update my e-mail address PCIe ASPM: forcedly -> forcibly gma500: push through device driver tree ... Fix up trivial conflicts: - arch/arm/mach-ep93xx/dma-m2p.c (deleted) - drivers/gpio/gpio-ep93xx.c (renamed and context nearby) - drivers/net/r8169.c (just context changes)		14 years ago
..
apparmor	Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc	14 years ago
integrity/ima	ima: remove unnecessary call to ima_must_measure	14 years ago
keys	Merge branch 'master' into for-next	14 years ago
selinux	VFS : mount lock scalability for internal mounts	14 years ago
smack	->permission() sanitizing: don't pass flags to ->inode_permission()	14 years ago
tomoyo	get rid of pointless checks for dentry->sb == NULL	14 years ago
Kconfig	security: select correct default LSM_MMAP_MIN_ADDR on ARM.	14 years ago
Makefile	AppArmor: Enable configuring and building of the AppArmor security module	15 years ago
capability.c	->permission() sanitizing: don't pass flags to ->inode_permission()	14 years ago
commoncap.c	capabilities: do not special case exec of init	14 years ago
device_cgroup.c	security,rcu: Convert call_rcu(whitelist_item_free) to kfree_rcu()	14 years ago
inode.c	convert get_sb_single() users	14 years ago
lsm_audit.c	LSM: separate LSM_AUDIT_DATA_DENTRY from LSM_AUDIT_DATA_PATH	14 years ago
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	15 years ago
security.c	->permission() sanitizing: don't pass flags to exec_permission()	14 years ago