Merge branch 'fix/misc' into for-linus

* fix/misc:
  ALSA: MAINTAINERS - Update SOUND
  ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()

diff --combined MAINTAINERS
index 0beac8a,c7ba935..1e067a6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -543,14 -543,6 +543,14 @@@ S:       Maintaine
  F:    arch/arm/lib/floppydma.S
  F:    arch/arm/include/asm/floppy.h
  
 +ARM PORT
 +P:    Russell King
 +M:    linux@arm.linux.org.uk
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +W:    http://www.arm.linux.org.uk/
 +S:    Maintained
 +F:    arch/arm/
 +
  ARM PRIMECELL MMCI PL180/1 DRIVER
  S:    Orphan
  F:    drivers/mmc/host/mmci.*
@@@ -600,13 -592,6 +600,13 @@@ M:       kernel@wantstofly.or
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
 +ARM/CLKDEV SUPPORT
 +P:    Russell King
 +M:    linux@arm.linux.org.uk
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +F:    arch/arm/common/clkdev.c
 +F:    arch/arm/include/asm/clkdev.h
 +
  ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
  P:    Mike Rapoport
  M:    mike@compulab.co.il
@@@ -625,15 -610,6 +625,15 @@@ L:       linux-arm-kernel@lists.arm.linux.org
  T:    git git://gitorious.org/linux-gemini/mainline.git
  S:    Maintained
  
 +ARM/EBSA110 MACHINE SUPPORT
 +P:    Russell King
 +M:    linux@arm.linux.org.uk
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +W:    http://www.arm.linux.org.uk/
 +S:    Maintained
 +F:    arch/arm/mach-ebsa110/
 +F:    drivers/net/arm/am79c961a.*
 +
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  P:    Daniel Ribeiro
  M:    drwyrm@gmail.com
@@@ -651,15 -627,6 +651,15 @@@ M:       paulius.zaleckas@teltonika.l
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
 +ARM/FOOTBRIDGE ARCHITECTURE
 +P:    Russell King
 +M:    linux@arm.linux.org.uk
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +W:    http://www.arm.linux.org.uk/
 +S:    Maintained
 +F:    arch/arm/include/asm/hardware/dec21285.h
 +F:    arch/arm/mach-footbridge/
 +
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
  P:    Sascha Hauer
  M:    kernel@pengutronix.de
@@@ -800,27 -767,19 +800,27 @@@ M:      kernel@wantstofly.or
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
 +ARM/RISCPC ARCHITECTURE
 +P:    Russell King
 +M:    linux@arm.linux.org.uk
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +W:    http://www.arm.linux.org.uk/
 +S:    Maintained
 +F:    arch/arm/common/time-acorn.c
 +F:    arch/arm/include/asm/hardware/entry-macro-iomd.S
 +F:    arch/arm/include/asm/hardware/ioc.h
 +F:    arch/arm/include/asm/hardware/iomd.h
 +F:    arch/arm/include/asm/hardware/memc.h
 +F:    arch/arm/mach-rpc/
 +F:    drivers/net/arm/ether*
 +F:    drivers/scsi/arm/
 +
  ARM/SHARK MACHINE SUPPORT
  P:    Alexander Schulz
  M:    alex@shark-linux.de
  W:    http://www.shark-linux.de/shark.html
  S:    Maintained
  
 -ARM/STRONGARM110 PORT
 -P:    Russell King
 -M:    rmk@arm.linux.org.uk
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 -W:    http://www.arm.linux.org.uk/
 -S:    Maintained
 -
  ARM/S3C2410 ARM ARCHITECTURE
  P:    Ben Dooks
  M:    ben-linux@fluff.org
@@@ -854,14 -813,6 +854,14 @@@ L:       linux-arm-kernel@lists.arm.linux.org
  W:    http://www.mcuos.com
  S:    Maintained
  
 +ARM/VFP SUPPORT
 +P:    Russell King
 +M:    linux@arm.linux.org.uk
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +W:    http://www.arm.linux.org.uk/
 +S:    Maintained
 +F:    arch/arm/vfp/
 +
  ARPD SUPPORT
  P:    Jonathan Layes
  L:    netdev@vger.kernel.org
@@@ -1421,11 -1372,6 +1421,11 @@@ S:    Maintaine
  F:    Documentation/input/cs461x.txt
  F:    sound/pci/cs46xx/
  
 +CLK API
 +P:    Russell King
 +M:    linux@arm.linux.org.uk
 +F:    include/linux/clk.h
 +
  CODA FILE SYSTEM
  P:    Jan Harkes
  M:    jaharkes@cs.cmu.edu
@@@ -1630,8 -1576,7 +1630,8 @@@ F:      drivers/infiniband/hw/cxgb3
  
  CYBERPRO FB DRIVER
  P:    Russell King
 -M:    rmk@arm.linux.org.uk
 +M:    linux@arm.linux.org.uk
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  F:    drivers/video/cyber2000fb.*
@@@ -3972,12 -3917,19 +3972,12 @@@ F:   Documentation/blockdev/nbd.tx
  F:    drivers/block/nbd.c
  F:    include/linux/nbd.h
  
 -NETWORK DEVICE DRIVERS
 -P:    Jeff Garzik
 -M:    jgarzik@pobox.com
 -L:    netdev@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
 -S:    Maintained
 -F:    drivers/net/
 -
  NETWORKING [GENERAL]
 -P:    Networking Team
 -M:    netdev@vger.kernel.org
 +P:    David S. Miller
 +M:    davem@davemloft.net
  L:    netdev@vger.kernel.org
  W:    http://linux-net.osdl.org/
 +T:    git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
  S:    Maintained
  F:    net/
  F:    include/net/
@@@ -5235,7 -5187,12 +5235,12 @@@ M:    perex@perex.c
  P:    Takashi Iwai
  M:    tiwai@suse.de
  L:    alsa-devel@alsa-project.org (subscribers-only)
+ W:    http://www.alsa-project.org/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
+ T:    git git://git.alsa-project.org/alsa-kernel.git
  S:    Maintained
+ F:    Documentation/sound/
+ F:    include/sound/
  F:    sound/
  
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)