linux/drivers/net/irda
David S. Miller 6cdee2f96a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/yellowfin.c
2009-09-02 00:32:56 -07:00
..
Kconfig irda: new Blackfin on-chip SIR IrDA driver 2009-06-13 01:56:02 +02:00
Makefile irda: new Blackfin on-chip SIR IrDA driver 2009-06-13 01:56:02 +02:00
act200l-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
actisys-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
ali-ircc.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
ali-ircc.h irda: convert to internal stats 2009-01-06 10:40:43 -08:00
au1k_ir.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-09-02 00:32:56 -07:00
au1000_ircc.h irda: convert to internal stats 2009-01-06 10:40:43 -08:00
bfin_sir.c net/irda: convert bfin_sir to net_device_ops 2009-06-29 19:41:49 -07:00
bfin_sir.h irda: new Blackfin on-chip SIR IrDA driver 2009-06-13 01:56:02 +02:00
donauboe.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
donauboe.h irda: convert to internal stats 2009-01-06 10:40:43 -08:00
ep7211-sir.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
esi-sir.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
girbil-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
irda-usb.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
irda-usb.h irda: convert to internal stats 2009-01-06 10:40:43 -08:00
irtty-sir.c headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
irtty-sir.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
kingsun-sir.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
ks959-sir.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
ksdazzle-sir.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
litelink-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
ma600-sir.c drivers/net/irda: fix sparse warnings: make symbols static 2008-12-26 00:03:19 -08:00
mcp2120-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
mcs7780.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -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 irda: convert to internal stats 2009-01-06 10:40:43 -08:00
old_belkin-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
pxaficp_ir.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-09-02 00:32:56 -07:00
sa1100_ir.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-09-02 00:32:56 -07:00
sir-dev.h irda: convert to internal stats 2009-01-06 10:40:43 -08:00
sir_dev.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
sir_dongle.c remove CONFIG_KMOD from drivers 2008-10-17 02:38:35 +11:00
smsc-ircc2.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
smsc-ircc2.h irda: remove CVS keywords 2008-06-11 21:00:41 -07:00
smsc-sio.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
stir4200.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
tekram-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
toim3232-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
via-ircc.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
via-ircc.h irda: convert to internal stats 2009-01-06 10:40:43 -08:00
vlsi_ir.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
vlsi_ir.h irda: convert to internal stats 2009-01-06 10:40:43 -08:00
w83977af.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
w83977af_ir.c irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
w83977af_ir.h irda: convert to internal stats 2009-01-06 10:40:43 -08:00