Linus Torvalds 66dc918d42 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 ...		2011-01-13 10:32:54 -08:00
..
include/plat	Merge branch 'topic/asoc' into for-linus	2011-01-13 08:37:24 +01:00
adc.c	ARM: SAMSUNG: Fix build warnings because of unused codes	2010-10-08 13:50:17 +09:00
clock-clksrc.c	ARM: SAMSUNG: Fix bug in clksrc-clk round_rate call.	2010-01-18 16:00:56 +09:00
clock.c	ARM: SAMSUNG: Add a workaround for get_clock() for serial driver	2010-10-08 13:50:18 +09:00
dev-adc.c	ARM: SAMSUNG: Moving ADC device definition to plat-samsung.	2010-05-18 13:38:44 +09:00
dev-asocdma.c	ARM: Samsung: Make sure ASoC DMA device is prototyped	2010-11-25 11:19:53 +00:00
dev-fb.c	ARM: SAMSUNG: Set S3C_FB_MAX_WIN in <plat/fb.h>	2010-05-18 18:46:27 +09:00
dev-hsmmc1.c	ARM: SAMSUNG: Add clock types into platform data	2010-10-25 16:02:47 +09:00
dev-hsmmc2.c	ARM: SAMSUNG: Add clock types into platform data	2010-10-25 16:02:47 +09:00
dev-hsmmc3.c	ARM: SAMSUNG: Add clock types into platform data	2010-10-25 16:02:47 +09:00
dev-hsmmc.c	ARM: SAMSUNG: Add clock types into platform data	2010-10-25 16:02:47 +09:00
dev-hwmon.c	ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsung	2010-05-12 17:43:03 +09:00
dev-i2c0.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dev-i2c1.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dev-i2c2.c	ARM: S5PV210: Fix wrong interrupt I2C2 and I2C3 number	2010-10-25 16:03:27 +09:00
dev-i2c3.c	ARM: S5PV310: Add I2C channel 3, 4, 5, 6, and 7 device support	2010-10-25 16:03:43 +09:00
dev-i2c4.c	ARM: S5PV310: Add I2C channel 3, 4, 5, 6, and 7 device support	2010-10-25 16:03:43 +09:00
dev-i2c5.c	ARM: S5PV310: Add I2C channel 3, 4, 5, 6, and 7 device support	2010-10-25 16:03:43 +09:00
dev-i2c6.c	ARM: S5PV310: Add I2C channel 3, 4, 5, 6, and 7 device support	2010-10-25 16:03:43 +09:00
dev-i2c7.c	ARM: S5PV310: Add I2C channel 3, 4, 5, 6, and 7 device support	2010-10-25 16:03:43 +09:00
dev-ide.c	ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs	2010-08-05 18:32:50 +09:00
dev-keypad.c	ARM: SAMSUNG: Add keypad device support	2010-08-06 21:27:50 +09:00
dev-nand.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dev-onenand.c	ARM: SAMSUNG: Add platform support code for OneNAND controller	2010-05-20 17:48:36 +09:00
dev-rtc.c	ARM: SAMSUNG: Move RTC device definitions in plat-samsung	2010-05-18 16:44:58 +09:00
dev-ts.c	ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration	2010-05-19 18:25:30 +09:00
dev-uart.c	ARM: SAMSUNG: Make UART device code common	2010-01-19 09:23:50 +09:00
dev-usb-hsotg.c	ARM: SAMSUNG: Add DMA masks to hsotg device	2010-02-03 01:54:54 +00:00
dev-usb.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dev-wdt.c	ARM: SAMSUNG: Reduce virtual memory size for WDT device	2010-08-05 18:32:49 +09:00
dma.c	ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung	2010-02-23 00:03:43 +00:00
gpio-config.c	ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks	2010-12-08 01:04:56 +00:00
gpio.c	ARM: SAMSUNG: Add common samsung_gpiolib_to_irq function	2010-10-21 07:54:57 +09:00
gpiolib.c	ARM: SAMSUNG: Fix on inclusion mach/gpio.h on gpiolib.c	2010-08-06 21:28:39 +09:00
init.c	ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung	2010-02-23 00:03:43 +00:00
irq-uart.c	ARM: SAMSUNG: Move IRQ UART handling for newer devices to plat-samsung	2010-01-15 17:10:14 +09:00
irq-vic-timer.c	ARM: SAMSUNG: Move IRQ VIC timer handling out to common header files	2010-01-15 17:10:13 +09:00
Kconfig	ARM: S5PV310: Add I2C channel 3, 4, 5, 6, and 7 device support	2010-10-25 16:03:43 +09:00
Makefile	ARM: Samsung: Define common audio-dma device	2010-11-23 14:04:44 +00:00
platformdata.c	ARM: SAMSUNG: Add helper to clone and set platform data	2010-08-05 18:32:49 +09:00
pm-check.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
pm-gpio.c	ARM: S5PV210: Add Power Management Support	2010-10-21 07:54:57 +09:00
pm.c	suspend: constify platform_suspend_ops	2010-11-16 14:14:02 +01:00
pwm-clock.c	ARM: SAMSUNG: Move pwm-clock code into plat-samsung	2010-01-15 17:10:12 +09:00
pwm.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
s3c-pl330.c	ARM: SAMSUNG: Move DMA clock enable into S3C PL330 driver	2010-10-25 16:10:56 +09:00
time.c	ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung	2010-02-23 00:03:43 +00:00
wakeup-mask.c	ARM: SAMSUNG: Add support for interrupt wakeup-sources	2010-05-20 21:07:01 +09:00