Merge branch 'omap/dt' into next/omap-gpmc
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 17:14:15 +0000 (18:14 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 17:14:15 +0000 (18:14 +0100)
commit0233903e40b9f45220976f684ad2b87e7dbfcfee
treeeba3974c15b05921b02f5f6e2e4bae0588ac6d35
parent0df1f2487d2f0d04703f142813d53615d62a1da4
parent065bd7fe50de5e6d0fd5034cbc87120a558a1219
Merge branch 'omap/dt' into next/omap-gpmc

Dependency for the gpmc changes

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/omap3-n900.dts
arch/arm/mach-omap2/pdata-quirks.c