diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-05 02:02:46 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-05 02:02:46 +0200 |
commit | 7405a749ae14f846cc2892c36d1a9343b0264b7c (patch) | |
tree | a2f959187acf6b8dcf878fd183c59cd277dffbab /arch/arm/kernel/topology.c | |
parent | Merge branch 'drivers/ocp2scp' into next/drivers (diff) | |
parent | drivers: bus: omap-ocp2scp: Fix compile error (diff) | |
download | linux-7405a749ae14f846cc2892c36d1a9343b0264b7c.tar.xz linux-7405a749ae14f846cc2892c36d1a9343b0264b7c.zip |
Merge branch 'drivers/ocp2scp' into next/drivers
* drivers/ocp2scp:
drivers: bus: omap-ocp2scp: Fix compile error
Diffstat (limited to 'arch/arm/kernel/topology.c')
0 files changed, 0 insertions, 0 deletions