Takashi Iwai a184d4e459 Merge branch 'for-linus' into for-next ...

Need to merge the fixes regarding EPSS.

Conflicts:
	sound/pci/hda/hda_codec.c

2012-08-28 09:26:59 -07:00

..

aoa

sound/aoa: Adapt to new i2c probing scheme

2012-07-11 18:22:48 +10:00

arm

ALSA: platform: Check CONFIG_PM_SLEEP instead of CONFIG_PM

2012-08-09 15:47:15 +02:00

atmel

ALSA: sound/atmel/ac97c.c: fix error return code

2012-08-20 10:56:01 +02:00

core

ASoC: Additional updates for 3.6

2012-08-20 21:26:04 +02:00

drivers

ALSA: platform: Check CONFIG_PM_SLEEP instead of CONFIG_PM

2012-08-09 15:47:15 +02:00

firewire

IEEE 1394 (FireWire) subsystem updates post v3.4:

2012-05-24 12:57:47 -07:00

i2c

[media] snd_tea575x: Add a cannot_mute flag

2012-07-30 17:57:01 -03:00

isa

Merge branch 'for-linus' into for-next

2012-08-28 09:26:59 -07:00

mips

ALSA: Convert mips directory to module_platform_driver

2011-11-24 13:03:02 +01:00

oss

ASoC: Additional updates for 3.6

2012-08-20 21:26:04 +02:00

parisc

…

pci

Merge branch 'for-linus' into for-next

2012-08-28 09:26:59 -07:00

pcmcia

ALSA: pdaudiocf: Remove superfluous pm_message_t argument from suspend

2012-07-03 08:23:08 +02:00

ppc

ALSA: sound/ppc/snd_ps3.c: fix error return code

2012-08-20 11:01:14 +02:00

sh

ALSA: Add missing .owner=THIS_MODULE to platform_driver definitions

2012-07-02 17:50:05 +02:00

soc

ASoC: wm9712: Fix inverted capture volume

2012-08-17 22:43:18 +01:00

sparc

ALSA: module_param: make bool parameters really bool

2011-12-19 10:34:41 +01:00

spi

ALSA: Convert at73c213 to module_spi_driver

2012-01-27 15:18:36 +01:00

synth

sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed

2011-10-31 19:31:22 -04:00

usb

Merge branch 'for-linus' into for-next

2012-08-20 22:14:26 +02:00

ac97_bus.c

…

Kconfig

um: switch to use of drivers/Kconfig

2011-11-02 14:15:41 +01:00

last.c

ALSA: workaround: change the timing of alsa_sound_last_init()

2012-04-19 13:51:54 +02:00

Makefile

ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver

2011-03-15 08:42:22 +01:00

sound_core.c

sound: allow the unit search until 256 in sound_core.c

2012-05-08 17:27:03 +02:00

sound_firmware.c

sound_firmware: don't pass crap to filp_close()

2012-07-29 21:24:22 +04:00