Merge remote-tracking branch 'asoc/fix/sh' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Mar 2013 14:08:04 +0000 (14:08 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Mar 2013 14:08:04 +0000 (14:08 +0000)

Trivial merge