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	unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig)	2011-06-09 16:24:42 +08:00
include	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-20 18:05:28 -08:00
kernel	Merge branch 'akpm' (incoming from Andrew)	2013-04-30 17:37:43 -07:00
lib	unicore32: fix build error for find bitops	2011-11-15 17:13:14 +08:00
mm	mm, vmalloc: change iterating a vmlist to find_vm_area()	2013-04-29 15:54:33 -07:00
.gitignore	unicore32 core architecture: build infrastructure	2011-03-17 09:19:05 +08:00
Kconfig	idle: Remove GENERIC_IDLE_LOOP config switch	2013-04-17 10:39:38 +02:00
Kconfig.debug	unicore32: drop unused Kconfig symbols	2011-11-15 17:13:18 +08:00
Makefile	unicore32: Use generic init_task	2012-05-05 13:00:26 +02:00