linux/sound/pci
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
ali5451
au88x0 [ALSA] sound/pci/au88x0/au88x0.c: ioremap balanced with iounmap 2006-10-06 20:23:05 +02:00
ca0106
cs46xx
cs5535audio
echoaudio
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
korg1212
mixart
nm256
pcxhr
riptide [ALSA] Various fixes for suspend/resume of ALSA PCI drivers 2006-10-22 10:51:10 +02:00
rme9652
trident
vx222
ymfpci
ad1889.c
ad1889.h
als300.c
als4000.c
atiixp.c
atiixp_modem.c
azt3328.c
azt3328.h
bt87x.c
cmipci.c
cs4281.c
ens1370.c
ens1371.c
es1938.c
es1968.c
fm801.c
intel8x0.c
intel8x0m.c
Kconfig
maestro3.c
Makefile
rme32.c
rme96.c
sonicvibes.c
via82xx.c
via82xx_modem.c