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)
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>

Trivial merge