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
..
at91_udc.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
at91_udc.h
config.c
dummy_hcd.c	[PATCH] misc arm pt_regs fixes	2006-10-08 12:32:36 -07:00
epautoconf.c
ether.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
file_storage.c
gadget_chips.h
gmidi.c
goku_udc.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
goku_udc.h
inode.c
Kconfig
lh7a40x_udc.c	USB: lh7a40x_udc remove double declaration	2006-12-01 14:23:37 -08:00
lh7a40x_udc.h
Makefile
ndis.h
net2280.c	USB: net2280: don't send unwanted zero-length packets	2006-12-01 14:23:36 -08:00
net2280.h	USB: net2280: don't send unwanted zero-length packets	2006-12-01 14:23:36 -08:00
omap_udc.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
omap_udc.h
pxa2xx_udc.c	USB: pxa2xx_udc recognizes ixp425 rev b0 chip	2006-12-01 14:23:37 -08:00
pxa2xx_udc.h
rndis.c
rndis.h
serial.c
usbstring.c
zero.c