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	FRV: Drop 'TOPDIR' from Makefiles	2008-01-28 23:14:37 +01:00
include/asm	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-30 17:25:34 -07:00
kernel	arch: remove direct definitions of KERN_<LEVEL> uses	2012-07-30 17:25:13 -07:00
lib	irq_work: Add generic hardirq context callbacks	2010-10-18 19:58:50 +02:00
mb93090-mb00	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-07-27 11:26:48 -07:00
mm	frv: remove the second parameter of kmap_atomic_primary()	2012-07-23 14:11:22 +08:00
defconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Kconfig	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	2012-07-30 17:25:21 -07:00
Kconfig.debug	[PATCH] frv: drop unsupported debugging features	2006-01-08 20:13:36 -08:00
Makefile	frv: Use generic init_task	2012-05-05 13:00:23 +02:00