Merge branch 'drivers/ocp2scp' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Sep 2012 14:54:29 +0000 (16:54 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 19 Sep 2012 14:54:29 +0000 (16:54 +0200)
commit25696b4b3541d5f7641b61e6abfda765426834b8
tree49de34c86f67d08b8ee84fba8f05a3e7040d4cac
parent2e6185f1fea6cf88e9ce25cde1d6291ddfb3d4f0
parent0ee7261c9212dbaf72d510e37f6c5b849d1847f0
Merge branch 'drivers/ocp2scp' into next/drivers

Merge patch from Santosh Shilimkar <santosh.shilimkar@ti.com>:

* drivers/ocp2scp:
  drivers: bus: Move the OMAP interconnect driver to drivers/bus/

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