Merge tag 'v3.4-rc7' into for-3.5
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 13 May 2012 12:32:54 +0000 (13:32 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 13 May 2012 12:32:54 +0000 (13:32 +0100)
commitdc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c
tree4573b99fb11e5b93bd011045039b370ddafe45e6
parentf1992dde7fef6713a469a5a142b86812b8a47f9e
parent36be50515fe2aef61533b516fa2576a2c7fe7664
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)
13 files changed:
MAINTAINERS
arch/arm/mach-shmobile/board-mackerel.c
drivers/base/regmap/regmap.c
sound/soc/blackfin/bf5xx-ssm2602.c
sound/soc/codecs/Kconfig
sound/soc/codecs/cs42l73.c
sound/soc/codecs/tlv320aic23.c
sound/soc/codecs/twl6040.c
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm_hubs.c
sound/soc/soc-core.c
sound/soc/soc-dapm.c