tree 0b1f155ae4628a2be4dc4dd4c7fbeeaf1d8016dc
parent b17471f5d121a53be1ccf6e0b0599441e56b468c
parent f4ebf1d1f8d10b703493e76300605e8be2f21bf5
author Arnd Bergmann <arnd@arndb.de> 1325023491 +0000
committer Arnd Bergmann <arnd@arndb.de> 1325023506 +0000

Merge branch 'omap/hwmod' into next/drivers

This is needed as a dependency for omap/ehci.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>