From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 13 May 2012 12:32:54 +0000 (+0100)
Subject: Merge tag 'v3.4-rc7' into for-3.5
X-Git-Tag: v3.5-rc1~118^2~3^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c;p=pandora-kernel.git

Merge tag 'v3.4-rc7' into for-3.5

Linux 3.4-rc7

Conflicts):
	drivers/base/regmap/regmap.c         (overlap with bug fixes)
	sound/soc/blackfin/bf5xx-ssm2602.c   (overlap with bug fixes)
---

dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c
Reading git-diff-tree failed