Merge branch 'omap/hwmod' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 22:04:51 +0000 (22:04 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 22:05:06 +0000 (22:05 +0000)
This is needed as a dependency for omap/ehci.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/mach-at91/at91rm9200_devices.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9263_devices.c
drivers/gpio/Makefile

Simple merge
Simple merge