From: Olof Johansson <olof@lixom.net>
Date: Wed, 5 Sep 2012 04:38:56 +0000 (-0700)
Subject: Merge branch 'ux500/asic-id' into next/soc
X-Git-Tag: v3.7-rc1~160^2~15
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=daa56a06b5a592ceb69130a1d15c067a078f2701;p=linux-block.git

Merge branch 'ux500/asic-id' into next/soc

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

daa56a06b5a592ceb69130a1d15c067a078f2701