]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5f66553a74668edb639d6578a474285de5cfe298
tree49de34c86f67d08b8ee84fba8f05a3e7040d4cac
parent9e9835ac622de34d4c0d573e96f97724682dc07d
parent203c3853ef57b0875a322d4e24fe928f93ba9ec7
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