kevin/linux
1
Fork 0
Code
48d4ed7a86
linux/drivers/net/irda
History
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 drivers/net: eliminate irq handler impossible checks, needless casts 2006-10-06 14:56:04 -04:00
ali-ircc.h
au1k_ir.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
au1000_ircc.h
donauboe.c [PATCH] irda: donauboe fixes, cleanups 2006-10-10 16:29:37 -07:00
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 drivers/net: eliminate irq handler impossible checks, needless casts 2006-10-06 14:56:04 -04:00
irport.h drivers/net: eliminate irq handler impossible checks, needless casts 2006-10-06 14:56:04 -04:00
irtty-sir.c
irtty-sir.h
Kconfig [IrDA]: irda-usb needs firmware loader 2006-09-28 18:02:47 -07:00
litelink-sir.c
litelink.c
ma600-sir.c
ma600.c
Makefile
mcp2120-sir.c
mcp2120.c
mcs7780.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
mcs7780.h IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
nsc-ircc.c drivers/net: eliminate irq handler impossible checks, needless casts 2006-10-06 14:56:04 -04:00
nsc-ircc.h
old_belkin-sir.c
old_belkin.c
pxaficp_ir.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sa1100_ir.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sir_dev.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
sir_dongle.c
sir-dev.h WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
smsc-ircc2.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
smsc-ircc2.h
smsc-sio.h
stir4200.c [PATCH] skge, sky2, et all. gplv2 only 2006-10-31 20:22:06 -05:00
tekram-sir.c
tekram.c
toim3232-sir.c
via-ircc.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
via-ircc.h
vlsi_ir.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
vlsi_ir.h
w83977af_ir.c drivers/net: eliminate irq handler impossible checks, needless casts 2006-10-06 14:56:04 -04:00
w83977af_ir.h
w83977af.h