Merge branch 'ux500/asic-id' into next/soc
commitdaa56a06b5a592ceb69130a1d15c067a078f2701
authorOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 04:38:56 +0000 (4 21:38 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 04:38:56 +0000 (4 21:38 -0700)
treeb2df34d67daf72d43d778a07ac6b923a3d421251
parentc1270363911365a764503b0ca3af6cbf85f5c325
parent79964bcd792fd9625affb4d7092ee09697f0409a
Merge branch 'ux500/asic-id' into next/soc

* ux500/asic-id:
  ARM: ux500: Correct Ux500 family names usage