Merge branch 'omap/dt' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Nov 2012 16:41:21 +0000 (17:41 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Nov 2012 16:41:21 +0000 (17:41 +0100)
commit8dbd2879e33be37adf40f747a5fb80ef1a6cd150
treec688d7980be8c1c0dbf5e411caaf2c102120102e
parentb770ea523d95837e968d46c7fe09a3f5edd9bb27
parentd308ba50a1234b299a00e63a95e61fdeb2f1a2df
Merge branch 'omap/dt' into next/drivers

Needed for the omap timer changes.

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