diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-04 21:38:56 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-04 21:38:56 -0700 |
commit | daa56a06b5a592ceb69130a1d15c067a078f2701 (patch) | |
tree | b2df34d67daf72d43d778a07ac6b923a3d421251 /arch/m68k/platform/68328/head-pilot.S | |
parent | c1270363911365a764503b0ca3af6cbf85f5c325 (diff) | |
parent | 79964bcd792fd9625affb4d7092ee09697f0409a (diff) | |
download | blackbird-op-linux-daa56a06b5a592ceb69130a1d15c067a078f2701.tar.gz blackbird-op-linux-daa56a06b5a592ceb69130a1d15c067a078f2701.zip |
Merge branch 'ux500/asic-id' into next/soc
* ux500/asic-id:
ARM: ux500: Correct Ux500 family names usage
Diffstat (limited to 'arch/m68k/platform/68328/head-pilot.S')
0 files changed, 0 insertions, 0 deletions