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
..
act200l-sir.c
act200l.c
actisys-sir.c
actisys.c
ali-ircc.c
ali-ircc.h
au1k_ir.c
au1000_ircc.h
donauboe.c
donauboe.h
ep7211_ir.c
esi-sir.c
esi.c
girbil-sir.c
girbil.c
irda-usb.c	usb: irda-usb free urb cleanup	2006-12-01 14:23:33 -08:00
irda-usb.h
irport.c
irport.h
irtty-sir.c
irtty-sir.h
Kconfig
litelink-sir.c
litelink.c
ma600-sir.c
ma600.c
Makefile
mcp2120-sir.c
mcp2120.c
mcs7780.c
mcs7780.h
nsc-ircc.c
nsc-ircc.h
old_belkin-sir.c
old_belkin.c
pxaficp_ir.c
sa1100_ir.c
sir_dev.c
sir_dongle.c
sir-dev.h
smsc-ircc2.c
smsc-ircc2.h
smsc-sio.h
stir4200.c
tekram-sir.c
tekram.c
toim3232-sir.c
via-ircc.c
via-ircc.h
vlsi_ir.c
vlsi_ir.h
w83977af_ir.c
w83977af_ir.h
w83977af.h