leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4c1ac1b491
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 Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
act200l.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
actisys-sir.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
actisys.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ali-ircc.c drivers/net: eliminate irq handler impossible checks, needless casts 2006-10-06 14:56:04 -04:00
ali-ircc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
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 Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
donauboe.c [PATCH] irda: donauboe fixes, cleanups 2006-10-10 16:29:37 -07:00
donauboe.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ep7211_ir.c [IRDA]: sti/cli removal from EP7211 IrDA driver 2006-03-20 19:00:04 -08:00
esi-sir.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
esi.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
girbil-sir.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
girbil.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
irda-usb.c usb: irda-usb free urb cleanup 2006-12-01 14:23:33 -08:00
irda-usb.h [IRDA]: irda-usb.c: STIR421x cleanups 2006-06-17 21:30:26 -07:00
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 [IRDA] sem2mutex: drivers/net/irda 2006-03-20 22:32:53 -08:00
irtty-sir.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Kconfig [IrDA]: irda-usb needs firmware loader 2006-09-28 18:02:47 -07:00
litelink-sir.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
litelink.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ma600-sir.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ma600.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile [IRDA]: Initial support for MCS7780 based dongles 2006-06-17 21:26:18 -07:00
mcp2120-sir.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mcp2120.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
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 [IRDA]: nsc-ircc: PM update 2006-03-20 18:59:05 -08:00
old_belkin-sir.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
old_belkin.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
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 [IRDA] sem2mutex: drivers/net/irda 2006-03-20 22:32:53 -08:00
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 [PATCH] smsc-ircc2: whitespace fixes 2005-09-07 16:57:57 -07:00
smsc-sio.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
stir4200.c [PATCH] skge, sky2, et all. gplv2 only 2006-10-31 20:22:06 -05:00
tekram-sir.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tekram.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
toim3232-sir.c [IRDA]: remove MODULE_PARM() 2006-03-20 22:33:41 -08:00
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 Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
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 [PATCH] inode_diet: Replace inode.u.generic_ip with inode.i_private 2006-09-27 08:26:17 -07:00
w83977af_ir.c drivers/net: eliminate irq handler impossible checks, needless casts 2006-10-06 14:56:04 -04:00
w83977af_ir.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
w83977af.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00