From: Pekka Enberg <penberg@kernel.org>
Date: Wed, 3 Oct 2012 06:56:37 +0000 (+0300)
Subject: Merge branch 'slab/common-for-cgroups' into slab/for-linus
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~8^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4178cdddd4cb860a17f363fe13264fff03da7f2;p=pandora-kernel.git

Merge branch 'slab/common-for-cgroups' into slab/for-linus

Fix up a trivial conflict with NUMA_NO_NODE cleanups.

Conflicts:
	mm/slob.c

Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

f4178cdddd4cb860a17f363fe13264fff03da7f2
Reading git-diff-tree failed