Commit 66dc918d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (348 commits)
  ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection
  ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO
  ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO
  ALSA: oxygen: fix Xonar DG input
  ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low
  ALSA: hda - Fix missing EAPD for Acer 4930G
  ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
  ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
  ALSA: hda - Don't refer ELD when unplugged
  ASoC: tpa6130a2: Fix compiler warning
  ASoC: tlv320dac33: Add DAPM selection for LOM invert
  ASoC: DMIC codec: Adding a generic DMIC codec
  ALSA: snd-usb-us122l: Fix missing NULL checks
  ALSA: snd-usb-us122l: Fix MIDI output
  ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()
  ASoC: Fix section mismatch in wm8995.c
  ALSA: oxygen: add S/PDIF source selection for Claro cards
  ALSA: oxygen: fix CD/MIDI for X-Meridian (2G)
  ASoC: fix migor audio build
  ALSA: include delay.h for msleep in Xonar DG support
  ...
parents b2034d47 6db9a0f3

Documentation/sound/alsa/ALSA-Configuration.txt

+9 −11
Original line number Diff line number Diff line
@@ -974,13 +974,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    See hdspm.txt for details.



  Module snd-hifier

  -----------------



    Module for the MediaTek/TempoTec HiFier Fantasia sound card.



    This module supports autoprobe and multiple cards.



  Module snd-ice1712

  ------------------
@@ -1531,15 +1524,20 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
  Module snd-oxygen

  -----------------



    Module for sound cards based on the C-Media CMI8788 chip:

    Module for sound cards based on the C-Media CMI8786/8787/8788 chip:

    * Asound A-8788

    * Asus Xonar DG

    * AuzenTech X-Meridian

    * AuzenTech X-Meridian 2G

    * Bgears b-Enspirer

    * Club3D Theatron DTS

    * HT-Omega Claro (plus)

    * HT-Omega Claro halo (XT)

    * Kuroutoshikou CMI8787-HG2PCI

    * Razer Barracuda AC-1

    * Sondigo Inferno

    * TempoTec HiFier Fantasia

    * TempoTec HiFier Serenade



    This module supports autoprobe and multiple cards.
@@ -2006,9 +2004,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
  Module snd-virtuoso

  -------------------



    Module for sound cards based on the Asus AV100/AV200 chips,

    i.e., Xonar D1, DX, D2, D2X, DS, HDAV1.3 (Deluxe), Essence ST

    (Deluxe) and Essence STX.

    Module for sound cards based on the Asus AV66/AV100/AV200 chips,

    i.e., Xonar D1, DX, D2, D2X, DS, Essence ST (Deluxe), Essence STX,

    HDAV1.3 (Deluxe), and HDAV1.3 Slim.



    This module supports autoprobe and multiple cards.

Documentation/sound/alsa/HD-Audio-Models.txt

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ ALC882/883/885/888/889 
  acer-aspire-7730g Acer Aspire 7730G

  acer-aspire-8930g Acer Aspire 8930G

  medion	Medion Laptops

  medion-md2	Medion MD2

  targa-dig	Targa/MSI

  targa-2ch-dig	Targa/MSI with 2-channel

  targa-8ch-dig Targa/MSI with 8-channel (MSI GX620)

MAINTAINERS

+44 −1
Original line number Diff line number Diff line
@@ -1523,6 +1523,14 @@ S: Supported 
F:	block/bsg.c

F:	include/linux/bsg.h



BT87X AUDIO DRIVER

M:	Clemens Ladisch <clemens@ladisch.de>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

T:	git git://git.alsa-project.org/alsa-kernel.git

S:	Maintained

F:	Documentation/sound/alsa/Bt87x.txt

F:	sound/pci/bt87x.c



BT8XXGPIO DRIVER

M:	Michael Buesch <mb@bu3sch.de>

W:	http://bu3sch.de/btgpio.php
@@ -1548,6 +1556,13 @@ S: Maintained 
F:	Documentation/video4linux/bttv/

F:	drivers/media/video/bt8xx/bttv*



C-MEDIA CMI8788 DRIVER

M:	Clemens Ladisch <clemens@ladisch.de>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

T:	git git://git.alsa-project.org/alsa-kernel.git

S:	Maintained

F:	sound/pci/oxygen/



CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS

M:	David Howells <dhowells@redhat.com>

L:	linux-cachefs@redhat.com
@@ -2339,6 +2354,13 @@ W: bluesmoke.sourceforge.net 
S:	Maintained

F:	drivers/edac/r82600_edac.c



EDIROL UA-101/UA-1000 DRIVER

M:	Clemens Ladisch <clemens@ladisch.de>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

T:	git git://git.alsa-project.org/alsa-kernel.git

S:	Maintained

F:	sound/usb/misc/ua101.c



EEEPC LAPTOP EXTRAS DRIVER

M:	Corentin Chary <corentincj@iksaif.net>

L:	acpi4asus-user@lists.sourceforge.net
@@ -3507,6 +3529,13 @@ L: linux-serial@vger.kernel.org 
S:	Maintained

F:	drivers/serial/jsm/



K10TEMP HARDWARE MONITORING DRIVER

M:	Clemens Ladisch <clemens@ladisch.de>

L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	Documentation/hwmon/k10temp

F:	drivers/hwmon/k10temp.c



K8TEMP HARDWARE MONITORING DRIVER

M:	Rudolf Marek <r.marek@assembler.cz>

L:	lm-sensors@lm-sensors.org
@@ -4537,6 +4566,13 @@ F: drivers/of 
F:	include/linux/of*.h

K:	of_get_property



OPL4 DRIVER

M:	Clemens Ladisch <clemens@ladisch.de>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

T:	git git://git.alsa-project.org/alsa-kernel.git

S:	Maintained

F:	sound/drivers/opl4/



OPROFILE

M:	Robert Richter <robert.richter@amd.com>

L:	oprofile-list@lists.sf.net
@@ -5283,7 +5319,7 @@ SAMSUNG AUDIO (ASoC) DRIVERS 
M:	Jassi Brar <jassi.brar@samsung.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/s3c24xx

F:	sound/soc/samsung



TIMEKEEPING, NTP

M:	John Stultz <johnstul@us.ibm.com>
@@ -6291,6 +6327,13 @@ S: Maintained 
W:	http://www.one-eyed-alien.net/~mdharm/linux-usb/

F:	drivers/usb/storage/



USB MIDI DRIVER

M:	Clemens Ladisch <clemens@ladisch.de>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

T:	git git://git.alsa-project.org/alsa-kernel.git

S:	Maintained

F:	sound/usb/midi.*



USB OHCI DRIVER

M:	David Brownell <dbrownell@users.sourceforge.net>

L:	linux-usb@vger.kernel.org

arch/arm/mach-kirkwood/openrd-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static void __init openrd_init(void) 


	kirkwood_i2c_init();



	if (machine_is_openrd_client()) {

	if (machine_is_openrd_client() || machine_is_openrd_ultimate()) {

		i2c_register_board_info(0, i2c_board_info,

			ARRAY_SIZE(i2c_board_info));

		kirkwood_audio_init();

arch/arm/mach-s3c2410/mach-h1940.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static struct platform_device *h1940_devices[] __initdata = { 
	&s3c_device_wdt,

	&s3c_device_i2c0,

	&s3c_device_iis,

	&s3c_device_pcm,

	&samsung_asoc_dma,

	&s3c_device_usbgadget,

	&h1940_device_leds,

	&h1940_device_bluetooth,

CRA Git | Maintained and supported by SUSTech CRA and CCSE