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)
commit24a118de116856323f51c664102b6afdad6a8be7
treec9f575a7742fb95ff69009308a36868bebf54eed
parent5886c743799f9190304b40255519cea5b50164ca
parentf4a75d2eb7b1e2206094b901be09adb31ba63681
Merge tag 'v3.7-rc6' into asoc-arizona

Linux 3.7-rc6

Conflicts:
sound/soc/codecs/wm5102.c
sound/soc/codecs/wm5102.c