github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
7cd3739f32
linux/sound
History
黄涛 7cd3739f32 Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 
Merge Linux 2.6.32.41
Conflicts:
	Makefile
	drivers/mmc/core/core.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/regd_common.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/dma.h
	drivers/net/wireless/b43/sdio.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/libertas/cmd.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00.h
	drivers/net/wireless/rt2x00/rt2x00dev.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/usb/serial/option.c
	mm/shmem.c
2011-06-16 11:56:59 +08:00
..
aoa ALSA: Don't assume i2c device probing always succeeds 2009-10-01 07:46:33 +02:00
arm ALSA: AACI: fix recording bug 2009-11-30 14:50:55 +01:00
atmel ALSA: snd-atmel-abdac: increase periods_min to 6 instead of 4 2009-04-06 03:56:28 +02:00
core Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
drivers ALSA: dummy - Fix descriptions of pcm_substreams parameter 2009-11-02 14:11:55 +01:00
i2c V4L/DVB (10771): tea575x-tuner: convert it to V4L2 API 2009-03-30 12:43:02 -03:00
isa Merge branch 'topic/cmi8330' into for-linus 2009-09-10 15:32:45 +02:00
mips sound: sgio2audio/pdaudiocf/usb-audio: initialize PCM buffer 2010-01-06 15:03:26 -08:00
oss sound: oss: midi_synth: check get_user() return value 2011-04-14 16:53:39 -07:00
parisc ALSA: sound/parisc: Move dereference after NULL test 2009-10-30 12:01:38 +01:00
pci ALSA: hda - MacBookAir3,1(3,2) alsa support 2011-05-09 15:55:20 -07:00
pcmcia sound: sgio2audio/pdaudiocf/usb-audio: initialize PCM buffer 2010-01-06 15:03:26 -08:00
ppc ALSA: powermac - Lineout detection on G4 DA 2011-05-09 15:55:18 -07:00
sh ALSA: snd-aica: declare MODULE_FIRMWARE 2009-11-08 09:13:51 +01:00
soc Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
sparc ALSA: Add missing SNDRV_PCM_INFO_BATCH flag to some drivers 2009-04-28 15:06:44 +02:00
spi ALSA: Convert to snd_card_create() in other sound/* 2009-01-12 15:21:19 +01:00
synth ALSA: emux: Add trivial compat ioctl handler 2011-05-09 15:55:17 -07:00
usb ALSA: caiaq - Fix possible string-buffer overflow 2011-03-02 09:46:51 -05:00
ac97_bus.c ALSA: ac97 - Include ac97_codec.h for ac97_bus_type declaration 2008-12-02 16:25:37 +01:00
Kconfig sound: make OSS device number claiming optional and schedule its removal 2009-08-10 13:59:36 +02:00
last.c
Makefile ALSA: Add Atmel ALSA drivers directory 2009-02-05 15:08:53 +01:00
sound_core.c Driver-Core: extend devnode callbacks to provide permissions 2009-09-19 12:50:38 -07:00
sound_firmware.c