Merge branch 'omap/dt-missed-3.4' into drivers/mmc
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:45:55 +0000 (21:45 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:46:01 +0000 (21:46 +0200)
commite6511df4f25607e2e6d60062eb69c28c057329fa
tree0902e695f2995d3919398b2ffd3b90ad66bad095
parent66f75a5d028beaf67c931435fdc3e7823125730c
parentb3431f5ba402a98a89b78a9408b4972d8870df4d
Merge branch 'omap/dt-missed-3.4' into drivers/mmc

The omap/dt branch adds a few instances of mmc device nodes that
need to get changed to use the common bindings. Pull that into
a new branch so we can apply the patch in a single run.

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