Merge tag 'v3.5-rc4' into for-3.6
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 25 Jun 2012 08:52:59 +0000 (09:52 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 25 Jun 2012 08:52:59 +0000 (09:52 +0100)
Linux 3.5-rc4 contains some bug fixes which overlap with new features.

1  2 
MAINTAINERS
arch/arm/mach-ux500/board-mop500.c
sound/soc/codecs/wm2000.c
sound/soc/codecs/wm8904.c
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8996.c
sound/soc/soc-dapm.c
sound/soc/tegra/tegra_wm8903.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge