Linus Torvalds 27c1ee3f92 Merge branch 'akpm' (Andrew's patch-bomb) ... Merge Andrew's first set of patches: "Non-MM patches: - lots of misc bits - tree-wide have_clk() cleanups - quite a lot of printk tweaks. I draw your attention to "printk: convert the format for KERN_<LEVEL> to a 2 byte pattern" which looks a bit scary. But afaict it's solid. - backlight updates - lib/ feature work (notably the addition and use of memweight()) - checkpatch updates - rtc updates - nilfs updates - fatfs updates (partial, still waiting for acks) - kdump, proc, fork, IPC, sysctl, taskstats, pps, etc - new fault-injection feature work" * Merge emailed patches from Andrew Morton <akpm@linux-foundation.org>: (128 commits) drivers/misc/lkdtm.c: fix missing allocation failure check lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table() fault-injection: add tool to run command with failslab or fail_page_alloc fault-injection: add selftests for cpu and memory hotplug powerpc: pSeries reconfig notifier error injection module memory: memory notifier error injection module PM: PM notifier error injection module cpu: rewrite cpu-notifier-error-inject module fault-injection: notifier error injection c/r: fcntl: add F_GETOWNER_UIDS option resource: make sure requested range is included in the root range include/linux/aio.h: cpp->C conversions fs: cachefiles: add support for large files in filesystem caching pps: return PTR_ERR on error in device_create taskstats: check nla_reserve() return sysctl: suppress kmemleak messages ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION ipc: compat: use signed size_t types for msgsnd and msgrcv ipc: allow compat IPC version field parsing if !ARCH_WANT_OLD_COMPAT_IPC ipc: add COMPAT_SHMLBA support ...		2012-07-30 17:25:34 -07:00
..
boot	MN10300: And Panasonic AM34 subarch and implement SMP	2010-10-27 17:28:55 +01:00
configs	cgroup: remove the ns_cgroup	2011-05-26 17:12:34 -07:00
include/asm	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-30 17:25:34 -07:00
kernel	Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-07-22 11:22:15 -07:00
lib	Disintegrate asm/system.h for MN10300	2012-03-28 18:30:02 +01:00
mm	mn10300: mm/dma-alloc.c needs <linux/export.h>	2012-07-11 16:04:42 -07:00
oprofile	MN10300: Kill MN10300's own profiling Kconfig	2009-04-09 10:53:16 -07:00
proc-mn2ws0050	Disintegrate asm/system.h for MN10300	2012-03-28 18:30:02 +01:00
proc-mn103e010	MN10300: Create general kernel debugger cache flushing	2011-03-18 16:54:30 +00:00
unit-asb2303	mn10300: move setup_jiffies_interrupt() to cevt-mn10300.c	2012-07-11 16:04:41 -07:00
unit-asb2305	mn10300: move setup_jiffies_interrupt() to cevt-mn10300.c	2012-07-11 16:04:41 -07:00
unit-asb2364	mn10300: move setup_jiffies_interrupt() to cevt-mn10300.c	2012-07-11 16:04:41 -07:00
Kconfig	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	2012-07-30 17:25:21 -07:00
Kconfig.debug	MN10300: Deprecate gdbstub	2011-03-18 16:54:32 +00:00
Makefile	mn10300: Use generic init_task	2012-05-05 13:00:24 +02:00