Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 17 Jan 2013 06:31:54 +0000 (15:31 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 17 Jan 2013 06:31:54 +0000 (15:31 +0900)
Conflicts:
sound/soc/codecs/arizona.c


Trivial merge