diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-04 17:02:46 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-04 17:02:46 -0700 |
commit | 7405a749ae14f846cc2892c36d1a9343b0264b7c (patch) | |
tree | a2f959187acf6b8dcf878fd183c59cd277dffbab /arch/arm/mach-orion5x/common.c | |
parent | 5ddf8bad8c5ff52aae512215131f0af37176f6ea (diff) | |
parent | 46ca6811534e66e7b3967512efe8259021cd5488 (diff) | |
download | blackbird-op-linux-7405a749ae14f846cc2892c36d1a9343b0264b7c.tar.gz blackbird-op-linux-7405a749ae14f846cc2892c36d1a9343b0264b7c.zip |
Merge branch 'drivers/ocp2scp' into next/drivers
* drivers/ocp2scp:
drivers: bus: omap-ocp2scp: Fix compile error
Diffstat (limited to 'arch/arm/mach-orion5x/common.c')
0 files changed, 0 insertions, 0 deletions