Merge tag 'v3.7-rc6' into asoc-arizona
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 19 Nov 2012 06:43:50 +0000 (15:43 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 19 Nov 2012 06:43:50 +0000 (15:43 +0900)
Linux 3.7-rc6

Conflicts:
sound/soc/codecs/wm5102.c


Trivial merge