github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 15:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
fd60bb322e
linux/sound
History
黄涛 e153fabd0b Merge remote-tracking branch 'origin/develop-3.0-rk30' into develop-3.0 
Conflicts:
	arch/arm/mach-rk29/Makefile
	arch/arm/mach-rk29/include/mach/rk29_camera.h
	drivers/gpu/ion/ion.c
	drivers/gpu/ion/ion_carveout_heap.c
	drivers/gpu/ion/ion_priv.h
	drivers/media/video/gc0307.c
	drivers/media/video/gc0308.c
	drivers/media/video/gc0309.c
	drivers/media/video/gc2015.c
	drivers/media/video/gt2005.c
	drivers/media/video/mt9d112.c
	drivers/media/video/mt9d113.c
	drivers/media/video/mt9p111.c
	drivers/media/video/mt9t111.c
	drivers/media/video/ov2640_rk.c
	drivers/media/video/ov2655.c
	drivers/media/video/ov2659.c
	drivers/media/video/ov5640.c
	drivers/media/video/ov5642.c
	drivers/media/video/ov7675.c
	drivers/media/video/rk29_camera.c
	drivers/media/video/sid130B.c
	drivers/media/video/siv120b.c
	drivers/mmc/host/rk29_sdmmc.c
	include/linux/ion.h
2012-03-25 15:16:37 +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 Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0 2011-11-09 13:06:28 +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
soc Merge remote-tracking branch 'origin/develop-3.0-rk30' into develop-3.0 2012-03-25 15:16:37 +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