]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite97dce259eae17abafebde1cf41b6f0d5f2ee587
tree4573b99fb11e5b93bd011045039b370ddafe45e6
parent41999a2933bc562cdc261c1a740296bf30986658
parent2b84fd49a1b2c18db87255a004b658e1b29692f9
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