Merge branch 'ux500/asic-id' into next/soc
authorOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 04:38:56 +0000 (21:38 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 04:38:56 +0000 (21:38 -0700)
* ux500/asic-id:
  ARM: ux500: Correct Ux500 family names usage


Trivial merge