2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 15:43:59 +08:00
linux-next/drivers/net/irda
David S. Miller 47871889c6 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
	drivers/firmware/iscsi_ibft.c
2010-02-28 19:23:06 -08:00
..
act200l-sir.c
actisys-sir.c
ali-ircc.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
ali-ircc.h
au1k_ir.c MIPS: Alchemy: devboard register abstraction 2010-02-27 12:52:50 +01:00
au1000_ircc.h
bfin_sir.c net/irda: convert bfin_sir to net_device_ops 2009-06-29 19:41:49 -07:00
bfin_sir.h
donauboe.c drivers/net/: use DEFINE_PCI_DEVICE_TABLE() 2010-01-07 23:54:26 -08:00
donauboe.h
ep7211-sir.c
esi-sir.c
girbil-sir.c
irda-usb.c drivers/net: Move && and || to end of previous line 2009-12-03 13:18:01 -08:00
irda-usb.h
irtty-sir.c headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
irtty-sir.h
Kconfig net/irda: sh_sir: Add SuperH IrDA driver 2010-02-02 07:47:56 -08:00
kingsun-sir.c headers: kref.h redux 2009-09-26 10:17:19 -07:00
ks959-sir.c headers: kref.h redux 2009-09-26 10:17:19 -07:00
ksdazzle-sir.c headers: kref.h redux 2009-09-26 10:17:19 -07:00
litelink-sir.c
ma600-sir.c
Makefile net/irda: sh_sir: Add SuperH IrDA driver 2010-02-02 07:47:56 -08:00
mcp2120-sir.c
mcs7780.c headers: kref.h redux 2009-09-26 10:17:19 -07:00
mcs7780.h irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
nsc-ircc.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
nsc-ircc.h
old_belkin-sir.c
pxaficp_ir.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel 2009-09-21 16:02:30 +01:00
sa1100_ir.c irda/sa1100_ir: check return value of startup hook 2009-10-13 03:17:37 -07:00
sh_sir.c net/irda: sh_sir: Add SuperH IrDA driver 2010-02-02 07:47:56 -08:00
sir_dev.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
sir_dongle.c
sir-dev.h
smsc-ircc2.c comment typo fix: sybsystem -> subsystem 2009-12-04 15:39:49 +01:00
smsc-ircc2.h
smsc-sio.h
stir4200.c drivers/net: Move && and || to end of previous line 2009-12-03 13:18:01 -08:00
tekram-sir.c
toim3232-sir.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
via-ircc.c drivers/net/: use DEFINE_PCI_DEVICE_TABLE() 2010-01-07 23:54:26 -08:00
via-ircc.h
vlsi_ir.c drivers/net/: use DEFINE_PCI_DEVICE_TABLE() 2010-01-07 23:54:26 -08:00
vlsi_ir.h
w83977af_ir.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
w83977af_ir.h
w83977af.h