From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 19 Nov 2012 06:43:50 +0000 (+0900)
Subject: Merge tag 'v3.7-rc6' into asoc-arizona
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~39^2~42^2~45^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24a118de116856323f51c664102b6afdad6a8be7;p=pandora-kernel.git

Merge tag 'v3.7-rc6' into asoc-arizona

Linux 3.7-rc6

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

24a118de116856323f51c664102b6afdad6a8be7
Reading git-diff-tree failed