]> Pileus Git - ~andy/linux/commit
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)
commit07b98403ee67838bbaded43bd687875b9d7f74e0
tree0b1f155ae4628a2be4dc4dd4c7fbeeaf1d8016dc
parentb17471f5d121a53be1ccf6e0b0599441e56b468c
parentf4ebf1d1f8d10b703493e76300605e8be2f21bf5
Merge branch 'omap/hwmod' into next/drivers

This is needed as a dependency for omap/ehci.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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