Merge tag 'v3.5-rc4' into for-3.6

Linux 3.5-rc4 contains some bug fixes which overlap with new features.

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc sound/soc/codecs/wm2000.c
Simple merge

diff --cc sound/soc/codecs/wm8904.c
Simple merge

diff --cc sound/soc/codecs/wm8994.c
Simple merge

diff --cc sound/soc/codecs/wm8996.c
Simple merge

diff --cc sound/soc/soc-dapm.c
Simple merge

diff --cc sound/soc/tegra/tegra_wm8903.c
Simple merge