Arnd Bergmann 884897e6a1 Merge branch 'highbank/soc' into next/soc ... Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/mach-omap2/board-generic.c arch/arm/plat-mxc/include/mach/gpio.h		2011-11-02 02:46:10 +01:00
..
asm	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00