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	Merge remote-tracking branch 'agust/next' into next	2013-02-20 11:39:05 +11:00
configs	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-02-23 17:09:55 -08:00
crypto	powerpc: Fix compile of sha1-powerpc-asm.S on 32-bit	2013-03-05 16:56:26 +11:00
include	Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-04-30 07:50:17 -07:00
kernel	dump_stack: unify debug information printed by show_regs()	2013-04-30 17:04:02 -07:00
kvm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-04-30 09:36:50 -07:00
lib	uprobes/powerpc: Add dependency on single step emulation	2013-01-29 11:35:06 +11:00
math-emu
mm	Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup	2013-04-29 19:14:20 -07:00
net	PPC: net: bpf_jit_comp: add VLAN instructions for BPF JIT	2012-11-17 22:12:47 -05:00
oprofile	Merge branch 'merge' into next	2013-01-29 11:33:37 +11:00
perf	perf/urgent fixes:	2013-03-18 10:00:56 +01:00
platforms	Power management and ACPI updates for 3.10-rc1	2013-04-30 15:21:02 -07:00
sysdev	Merge remote-tracking branch 'agust/next' into next	2013-02-20 11:39:05 +11:00
xmon	powerpc/xmon/sysrq: fix inconstistent help message of sysrq key	2013-04-30 17:04:10 -07:00
Kconfig	idle: Remove GENERIC_IDLE_LOOP config switch	2013-04-17 10:39:38 +02:00
Kconfig.debug	powerpc: IOMMU fault injection	2012-07-10 19:18:59 +10:00
Makefile	powerpc: Avoid load of static chain register when calling nested functions through a pointer on 64bit	2013-01-10 17:01:27 +11:00
relocs_check.pl