Linus Torvalds a429638cac Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits) ASoC: twl6040 - Add method to query optimum PDM_DL1 gain ALSA: hda - Fix the lost power-setup of seconary pins after PM resume ALSA: usb-audio: add Yamaha MOX6/MOX8 support ALSA: virtuoso: add S/PDIF input support for all Xonars ALSA: ice1724 - Support for ooAoo SQ210a ALSA: ice1724 - Allow card info based on model only ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations ALSA: hdspm - Provide unique driver id based on card serial ASoC: Dynamically allocate the rtd device for a non-empty release() ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs ALSA: hda - Use auto-parser for HP laptops with cx20459 codec ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info() ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref() ALSA: hda/cirrus - support for iMac12,2 model ASoC: cx20442: add bias control over a platform provided regulator ALSA: usb-audio - Avoid flood of frame-active debug messages ALSA: snd-usb-us122l: Delete calls to preempt_disable mfd: Put WM8994 into cache only mode when suspending ... Fix up trivial conflicts in: - arch/arm/mach-s3c64xx/mach-crag6410.c: renamed speyside_wm8962 to tobermory, added littlemill right next to it - drivers/base/regmap/{regcache.c,regmap.c}: duplicate diff that had already come in with other changes in the regmap tree		2012-01-12 08:00:30 -08:00
..
aoa	Merge branch 'master' into for-next	2011-11-13 20:55:53 +01:00
arm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
atmel	ALSA: atmel/ac97c: using software reset instead hardware reset if not available	2011-12-19 11:27:41 +01:00
core	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
drivers	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
firewire	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
i2c	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
isa	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
mips	ALSA: Convert mips directory to module_platform_driver	2011-11-24 13:03:02 +01:00
oss	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
parisc
pci	Merge branch 'topic/hda' into for-linus	2012-01-12 09:59:18 +01:00
pcmcia	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
ppc	Merge branch 'topic/misc' into for-linus	2012-01-12 09:59:14 +01:00
sh	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
soc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
sparc	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
spi	ALSA: atmel - update author email for ABDAC, AC97C and AT73C213	2011-06-28 16:56:07 +02: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' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
ac97_bus.c	sound: Fixed line limit issue in sound/ac97_bus.c	2010-12-06 16:09:49 +01:00
Kconfig	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
last.c
Makefile	ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver	2011-03-15 08:42:22 +01:00
sound_core.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
sound_firmware.c	sound: read i_size with i_size_read()	2011-03-18 15:14:57 +01:00