From: Mark Brown <broonie@linaro.org>
Date: Fri, 14 Jun 2013 09:16:06 +0000 (+0100)
Subject: Merge branch 'fix/wm8962' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~15^2~3^2~24^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=384b8345589cbbb18a99ce1b112da90c58c802e8;p=pandora-kernel.git

Merge branch 'fix/wm8962' of git://git./linux/kernel/git/broonie/sound into asoc-wm8962

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

384b8345589cbbb18a99ce1b112da90c58c802e8
Reading git-diff-tree failed