From: Olof Johansson Date: Sat, 29 Sep 2012 21:31:55 +0000 (-0700) Subject: Merge tag 'ep93xx-fixes-for-3.7' of git://github.com/RyanMallon/linux-ep93xx into... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b10dcdcac43b2b5adf800a19f782fef38ada75a1;p=linux-beck.git Merge tag 'ep93xx-fixes-for-3.7' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical From Ryan Mallon: * tag 'ep93xx-fixes-for-3.7' of git://github.com/RyanMallon/linux-ep93xx: ARM: ep93xx: Move ts72xx.h out of include/mach ARM: ep93xx: use __iomem pointers for MMIO ARM: ep93xx: Fix build error due to 'SZ_32M' undeclared --- b10dcdcac43b2b5adf800a19f782fef38ada75a1