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
..
hda_codec.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
hda_codec.h
hda_generic.c
hda_intel.c	[PATCH] ALSA: hda-intel - Disable MSI support by default	2006-11-14 16:04:27 -08:00
hda_local.h	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
hda_patch.h
hda_proc.c
Makefile
patch_analog.c	[ALSA] hda-codec - Add model entry for ASUS U5F laptop	2006-10-22 10:51:11 +02:00
patch_atihdmi.c	[ALSA] hda_intel: add ATI RS690 HDMI audio support	2006-10-22 10:51:12 +02:00
patch_cmedia.c
patch_realtek.c	[ALSA] hda: fix typo for xw4400 PCI sub-ID	2006-11-28 13:46:37 +01:00
patch_si3054.c	[ALSA] hda/patch_si3054: new codec vendor IDs	2006-10-06 20:22:54 +02:00
patch_sigmatel.c	[ALSA] hda: fix sigmatel dell system detection	2006-11-28 13:46:35 +01:00