openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/sound/pci
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
 		2006-12-05 14:37:56 +00:00
..
ac97 WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
ali5451 [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
au88x0 [ALSA] sound/pci/au88x0/au88x0.c: ioremap balanced with iounmap 2006-10-06 20:23:05 +02:00
ca0106 IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
cs46xx [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
cs5535audio [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
echoaudio IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
emu10k1 [ALSA] snd-emu10k1: Fix capture for one variant. 2006-11-28 13:46:39 +01:00
hda Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
ice1712 IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
korg1212 Various drivers' irq handlers: kill dead code, needless casts 2006-10-06 15:00:58 -04:00
mixart IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
nm256 [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
pcxhr IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
riptide [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
rme9652 IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
trident [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
vx222 [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
ymfpci [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
Kconfig [ALSA] Move CONFIG_SND_AC97_POWER_SAVE to pci/Kconfig 2006-09-23 10:48:36 +02:00
Makefile [ALSA] Add echoaudio sound drivers 2006-06-28 19:31:20 +02:00
ad1889.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
ad1889.h [ALSA] ad1889: add AD1889 driver 2005-09-12 10:40:17 +02:00
als300.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
als4000.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
atiixp.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
atiixp_modem.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
azt3328.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
azt3328.h [ALSA] azt3328.c: add 3D sound mixer switch/rename controls 2006-06-22 21:33:39 +02:00
bt87x.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
cmipci.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
cs4281.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
ens1370.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
ens1371.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
es1938.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
es1968.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
fm801.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
intel8x0.c [PATCH] Merge headphone and speaker volume controls for Panasonic R4 laptop 2006-10-24 21:42:50 -07:00
intel8x0m.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
maestro3.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
rme32.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
rme96.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sonicvibes.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
via82xx.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
via82xx_modem.c [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00