Andrew Morton c255a45805 memcg: rename config variables ... Sanity: CONFIG_CGROUP_MEM_RES_CTLR -> CONFIG_MEMCG CONFIG_CGROUP_MEM_RES_CTLR_SWAP -> CONFIG_MEMCG_SWAP CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED -> CONFIG_MEMCG_SWAP_ENABLED CONFIG_CGROUP_MEM_RES_CTLR_KMEM -> CONFIG_MEMCG_KMEM [mhocko@suse.cz: fix missed bits] Cc: Glauber Costa <glommer@parallels.com> Acked-by: Michal Hocko <mhocko@suse.cz> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Hugh Dickins <hughd@google.com> Cc: Tejun Heo <tj@kernel.org> Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Cc: David Rientjes <rientjes@google.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2012-07-31 18:42:43 -07:00
..
boot
configs	memcg: rename config variables	2012-07-31 18:42:43 -07:00
include/asm	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-30 17:25:34 -07:00
kernel	Merge branch 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-07-30 10:11:31 -07:00
kvm	powerpc/kvm/bookehv: Fix build regression	2012-07-27 11:42:32 +10:00
lib
math-emu
mm
net
oprofile
perf
platforms	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
sysdev	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
xmon
Kconfig	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	2012-07-30 17:25:21 -07:00
Kconfig.debug
Makefile
relocs_check.pl