黄涛 d7fb2169b6 Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0 ...

Conflicts:
	arch/arm/mach-rk30/include/mach/rk30_camera.h
	arch/arm/plat-rk/include/plat/rk_camera.h
	drivers/gpio/gpio-tps65910.c
	drivers/media/video/rk30_camera_oneframe.c
	drivers/mmc/host/rk29_sdmmc.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
	drivers/regulator/rk30-pwm-regulator.c
	drivers/usb/dwc_otg/dwc_otg_driver.c
	drivers/usb/dwc_otg/dwc_otg_hcd.c
	drivers/usb/dwc_otg/dwc_otg_pcd.c
	sound/soc/codecs/Makefile
	sound/soc/rk29/Kconfig

2012-08-17 21:48:20 +08:00

..

aoa

Revert wrong fixes for common misspellings

2011-04-26 23:31:11 -07:00

arm

Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.39

2011-04-03 19:28:29 +09:00

atmel

ALSA: atmel - update author email for ABDAC, AC97C and AT73C213

2011-06-28 16:56:07 +02:00

core

add WIMO supported

2012-06-02 16:52:19 +08:00

drivers

Fix common misspellings

2011-03-31 11:26:23 -03:00

firewire

ALSA: isight: adjust for new queueing API

2011-06-17 11:37:29 +02:00

i2c

ALSA: tea575x: use better card and bus names

2011-05-13 19:43:24 +02:00

isa

Fix common misspellings

2011-03-31 11:26:23 -03:00

mips

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

oss

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

parisc

…

pci

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

pcmcia

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

ppc

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:09:59 +08:00

sh

sound: sh: ctrl_in/outX to __raw_read/writeX conversion.

2010-10-27 15:53:50 +09:00

soc

Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0

2012-08-17 21:48:20 +08:00

sparc

dt/sound: Eliminate users of of_platform_{,un}register_driver

2011-02-28 13:22:44 -07:00

spi

ALSA: atmel - update author email for ABDAC, AC97C and AT73C213

2011-06-28 16:56:07 +02:00

synth

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:09:59 +08:00

usb

ALSA: usb-audio: Check for possible chip NULL pointer before clearing probing flag

2011-10-03 11:41:08 -07:00

ac97_bus.c

sound: Fixed line limit issue in sound/ac97_bus.c

2010-12-06 16:09:49 +01:00

Kconfig

ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver

2011-03-15 08:42:22 +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

sound: Use sound_register_*() for additional OSS minor devices

2011-03-09 20:10:37 +01:00

sound_firmware.c

sound: read i_size with i_size_read()

2011-03-18 15:14:57 +01:00