ARM: mach-nomadik: remove mach/memory.h
authorNicolas Pitre <nicolas.pitre@linaro.org>
Wed, 6 Jul 2011 02:52:54 +0000 (22:52 -0400)
committerNicolas Pitre <nico@fluxnic.net>
Thu, 13 Oct 2011 16:49:33 +0000 (12:49 -0400)
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
arch/arm/Kconfig
arch/arm/mach-nomadik/include/mach/memory.h [deleted file]

Simple merge
diff --cc arch/arm/mach-nomadik/include/mach/memory.h
Simple merge