Merge tag 'asoc-v3.15-rc5-core' into asoc-linus

ASoC: Core fixes for v3.15

A few things here:

 - Fix the creation of spurious CODEC<->CODEC links which caused DAPM to
   have audio paths which shouldn't be present causing spurious powerups
   and potential audible issues for users.
 - Ensure the suspend->off transition doesn't have spurious transitions
   to prepare added to the sequence.
 - Fix incorrect skipping of PCM suspension for active audio streams.
 - Remove Timur Tabi from the CS4270 maintainers, Cirrus are now doing
   this and Timur no longer has the boards that he was using.

# gpg: Signature made Wed 14 May 2014 12:59:19 BST using RSA key ID 7EA229BD
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"

diff --combined MAINTAINERS
index 51ebb779c5f33ee1693e740066bfbd1c004fa819,8f46182ef910bd17ad5fab50f82ffa3ef9611231..3be14ee584f95f1db258de18df41c9a749399bce
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2245,12 -2245,6 +2245,6 @@@ L:     linux-usb@vger.kernel.or
  S:    Maintained
  F:    drivers/usb/host/ohci-ep93xx.c
  
- CIRRUS LOGIC CS4270 SOUND DRIVER
- M:    Timur Tabi <timur@tabi.org>
- L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
- S:    Odd Fixes
- F:    sound/soc/codecs/cs4270*
- 
  CIRRUS LOGIC AUDIO CODEC DRIVERS
  M:    Brian Austin <brian.austin@cirrus.com>
  M:    Paul Handrigan <Paul.Handrigan@cirrus.com>
@@@ -3485,12 -3479,6 +3479,12 @@@ S:    Maintaine
  F:    drivers/extcon/
  F:    Documentation/extcon/
  
 +EXYNOS DP DRIVER
 +M:    Jingoo Han <jg1.han@samsung.com>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Maintained
 +F:    drivers/gpu/drm/exynos/exynos_dp*
 +
  EXYNOS MIPI DISPLAY DRIVERS
  M:    Inki Dae <inki.dae@samsung.com>
  M:    Donghwa Lee <dh09.lee@samsung.com>
@@@ -3556,7 -3544,7 +3550,7 @@@ F:      include/scsi/libfcoe.
  F:    include/uapi/scsi/fc/
  
  FILE LOCKING (flock() and fcntl()/lockf())
 -M:    Jeff Layton <jlayton@redhat.com>
 +M:    Jeff Layton <jlayton@poochiereds.net>
  M:    J. Bruce Fields <bfields@fieldses.org>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
@@@ -5114,19 -5102,14 +5108,19 @@@ F:   drivers/s390/kvm
  
  KERNEL VIRTUAL MACHINE (KVM) FOR ARM
  M:    Christoffer Dall <christoffer.dall@linaro.org>
 +M:    Marc Zyngier <marc.zyngier@arm.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    kvmarm@lists.cs.columbia.edu
  W:    http://systems.cs.columbia.edu/projects/kvm-arm
  S:    Supported
  F:    arch/arm/include/uapi/asm/kvm*
  F:    arch/arm/include/asm/kvm*
  F:    arch/arm/kvm/
 +F:    virt/kvm/arm/
 +F:    include/kvm/arm_*
  
  KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
 +M:    Christoffer Dall <christoffer.dall@linaro.org>
  M:    Marc Zyngier <marc.zyngier@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    kvmarm@lists.cs.columbia.edu
@@@ -6793,7 -6776,7 +6787,7 @@@ PERFORMANCE EVENTS SUBSYSTE
  M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
  M:    Paul Mackerras <paulus@samba.org>
  M:    Ingo Molnar <mingo@redhat.com>
 -M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 +M:    Arnaldo Carvalho de Melo <acme@kernel.org>
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Supported
@@@ -7288,6 -7271,7 +7282,6 @@@ F:      drivers/video/aty/aty128fb.
  RALINK RT2X00 WIRELESS LAN DRIVER
  P:    rt2x00 project
  M:    Ivo van Doorn <IvDoorn@gmail.com>
 -M:    Gertjan van Wingerde <gwingerde@gmail.com>
  M:    Helmut Schaa <helmut.schaa@googlemail.com>
  L:    linux-wireless@vger.kernel.org
  L:    users@rt2x00.serialmonkey.com (moderated for non-subscribers)
@@@ -7303,7 -7287,7 +7297,7 @@@ F:      Documentation/blockdev/ramdisk.tx
  F:    drivers/block/brd.c
  
  RANDOM NUMBER DRIVER
 -M:    Theodore Ts'o" <tytso@mit.edu>
 +M:    "Theodore Ts'o" <tytso@mit.edu>
  S:    Maintained
  F:    drivers/char/random.c
  
@@@ -7684,6 -7668,7 +7678,6 @@@ F:      drivers/clk/samsung
  SAMSUNG SXGBE DRIVERS
  M:    Byungho An <bh74.an@samsung.com>
  M:    Girish K S <ks.giri@samsung.com>
 -M:    Siva Reddy Kallam <siva.kallam@samsung.com>
  M:    Vipul Pandya <vipul.pandya@samsung.com>
  S:    Supported
  L:    netdev@vger.kernel.org
@@@ -8324,7 -8309,7 +8318,7 @@@ F:      include/linux/compiler.
  
  SPEAR PLATFORM SUPPORT
  M:    Viresh Kumar <viresh.linux@gmail.com>
 -M:    Shiraz Hashim <shiraz.hashim@st.com>
 +M:    Shiraz Hashim <shiraz.linux.kernel@gmail.com>
  L:    spear-devel@list.st.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
@@@ -9960,7 -9945,7 +9954,7 @@@ F:      drivers/net/hamradio/*scc.
  F:    drivers/net/hamradio/z8530.h
  
  ZBUD COMPRESSED PAGE ALLOCATOR
 -M:    Seth Jennings <sjenning@linux.vnet.ibm.com>
 +M:    Seth Jennings <sjennings@variantweb.net>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/zbud.c
@@@ -10005,7 -9990,7 +9999,7 @@@ F:     mm/zsmalloc.
  F:    include/linux/zsmalloc.h
  
  ZSWAP COMPRESSED SWAP CACHING
 -M:    Seth Jennings <sjenning@linux.vnet.ibm.com>
 +M:    Seth Jennings <sjennings@variantweb.net>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/zswap.c