Takashi Iwai ddf83485d7 Merge branch 'for-linus' into for-next ... Conflicts: sound/pci/hda/hda_codec.c Signed-off-by: Takashi Iwai <tiwai@suse.de>		2012-08-20 22:14:26 +02:00
..
imgs	…
Makefile	…
cs46xx.c	ALSA: PCI: Replace CONFIG_PM with CONFIG_PM_SLEEP	2012-08-14 18:12:04 +02:00
cs46xx.h	ALSA: PCI: Replace CONFIG_PM with CONFIG_PM_SLEEP	2012-08-14 18:12:04 +02:00
cs46xx_dsp_scb_types.h	ALSA: Move some headers to local directories from include/sound	2012-07-03 08:23:09 +02:00
cs46xx_dsp_spos.h	ALSA: Move some headers to local directories from include/sound	2012-07-03 08:23:09 +02:00
cs46xx_dsp_task_types.h	ALSA: Move some headers to local directories from include/sound	2012-07-03 08:23:09 +02:00
cs46xx_image.h	…
cs46xx_lib.c	Merge branch 'for-linus' into for-next	2012-08-20 22:14:26 +02:00
cs46xx_lib.h	ALSA: PCI: Replace CONFIG_PM with CONFIG_PM_SLEEP	2012-08-14 18:12:04 +02:00
dsp_spos.c	ALSA: PCI: Replace CONFIG_PM with CONFIG_PM_SLEEP	2012-08-14 18:12:04 +02:00
dsp_spos.h	…
dsp_spos_scb_lib.c	ALSA: PCI: Replace CONFIG_PM with CONFIG_PM_SLEEP	2012-08-14 18:12:04 +02:00