Arnd Bergmann 5725aeae5f Merge branch 'depends/rmk/memory_h' into next/fixes ... Fix up all conflicts between the memory.h cleanup and bug fixes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2011-11-01 00:25:01 +01:00
..
mach	Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-28 12:02:27 -07:00