From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 8 Nov 2011 01:17:30 +0000 (+0000)
Subject: Merge branch 'for-3.2' into for-3.3
X-Git-Tag: firefly_0821_release~3680^2~2691^2~497
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.2' into for-3.3

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

4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb