Merge remote-tracking branch 'asoc/topic/blackfin' into for-3.7
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 17 Aug 2012 22:26:44 +0000 (23:26 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 17 Aug 2012 22:26:44 +0000 (23:26 +0100)

Trivial merge