Merge remote-tracking branch 'asoc/topic/ux500' into for-3.7
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 22 Sep 2012 22:47:58 +0000 (18:47 -0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 22 Sep 2012 22:47:58 +0000 (18:47 -0400)

Trivial merge