Conflicts:
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/io.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>