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
..
cdc-acm.c	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
cdc-acm.h	[PATCH] USB: cdc-acm: add a new special case for modems with buggy firmware	2006-06-21 15:04:08 -07:00
Kconfig	[PATCH] USB: remove OBSOLETE_OSS_USB_DRIVER drivers	2006-03-20 14:49:54 -08:00
Makefile	[PATCH] USB: remove OBSOLETE_OSS_USB_DRIVER drivers	2006-03-20 14:49:54 -08:00
usblp.c	USB: usblp: fix system suspend for some systems	2006-11-03 11:57:18 -08:00