Linus Torvalds 5f56886521 Merge branch 'akpm' (incoming from Andrew) ... Merge third batch of fixes from Andrew Morton: "Most of the rest. I still have two large patchsets against AIO and IPC, but they're a bit stuck behind other trees and I'm about to vanish for six days. - random fixlets - inotify - more of the MM queue - show_stack() cleanups - DMI update - kthread/workqueue things - compat cleanups - epoll udpates - binfmt updates - nilfs2 - hfs - hfsplus - ptrace - kmod - coredump - kexec - rbtree - pids - pidns - pps - semaphore tweaks - some w1 patches - relay updates - core Kconfig changes - sysrq tweaks" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (109 commits) Documentation/sysrq: fix inconstistent help message of sysrq key ethernet/emac/sysrq: fix inconstistent help message of sysrq key sparc/sysrq: fix inconstistent help message of sysrq key powerpc/xmon/sysrq: fix inconstistent help message of sysrq key ARM/etm/sysrq: fix inconstistent help message of sysrq key power/sysrq: fix inconstistent help message of sysrq key kgdb/sysrq: fix inconstistent help message of sysrq key lib/decompress.c: fix initconst notifier-error-inject: fix module names in Kconfig kernel/sys.c: make prctl(PR_SET_MM) generally available UAPI: remove empty Kbuild files menuconfig: print more info for symbol without prompts init/Kconfig: re-order CONFIG_EXPERT options to fix menuconfig display kconfig menu: move Virtualization drivers near other virtualization options Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS relay: use macro PAGE_ALIGN instead of FIX_SIZE kernel/relay.c: move FIX_SIZE macro into relay.c kernel/relay.c: remove unused function argument actor drivers/w1/slaves/w1_ds2760.c: fix the error handling in w1_ds2760_add_slave() drivers/w1/slaves/w1_ds2781.c: fix the error handling in w1_ds2781_add_slave() ...		2013-04-30 17:37:43 -07:00
..
boot	Kbuild: centralize MKIMAGE and cmd_uimage definitions	2012-03-26 15:49:20 +02:00
configs	arch: Change defconfigs to point to g_mass_storage.	2012-11-08 16:00:52 +02:00
include	treewide: Fix typos in printk and comment	2013-03-18 14:57:53 +01:00
kernel	dump_stack: unify debug information printed by show_regs()	2013-04-30 17:04:02 -07:00
lib	blackfin: license: Change ADI BSD license	2012-05-21 14:54:30 +08:00
mach-bf518	blackfin: anomaly: add anomaly 16000030 for bf5xx	2012-12-13 15:22:03 +08:00
mach-bf527	blackfin: anomaly: add anomaly 16000030 for bf5xx	2012-12-13 15:22:03 +08:00
mach-bf533	blackfin: anomaly: add anomaly 16000030 for bf5xx	2012-12-13 15:22:03 +08:00
mach-bf537	blackfin: anomaly: add anomaly 16000030 for bf5xx	2012-12-13 15:22:03 +08:00
mach-bf538	blackfin: anomaly: add anomaly 16000030 for bf5xx	2012-12-13 15:22:03 +08:00
mach-bf548	blackfin: anomaly: add anomaly 16000030 for bf5xx	2012-12-13 15:22:03 +08:00
mach-bf561	blackfin: anomaly: add anomaly 16000030 for bf5xx	2012-12-13 15:22:03 +08:00
mach-bf609	[media] blackfin: replace V4L2_IN/OUT_CAP_CUSTOM_TIMINGS by DV_TIMINGS	2013-03-19 16:16:41 -03:00
mach-common	Power management and ACPI updates for 3.10-rc1	2013-04-30 15:21:02 -07:00
mm	mm/blackfin: use common help functions to free reserved pages	2013-04-29 15:54:29 -07:00
oprofile	Blackfin arch: remove hardware PM code, oprofile not use it	2009-01-07 23:14:39 +08:00
Clear_BSD.txt	blackfin: license: Change ADI BSD license	2012-05-21 14:54:30 +08:00
Kconfig	idle: Remove GENERIC_IDLE_LOOP config switch	2013-04-17 10:39:38 +02:00
Kconfig.debug	blackfin: bf60x: pm: Add a debug option to calculate kernel wakeup time.	2012-05-21 14:54:52 +08:00
Makefile	kbuild: add symbol prefix arg to kallsyms	2012-09-11 10:25:12 +08:00