kernel-fxtec-pro1x/drivers/net/irda
David S. Miller 9eeda9abd1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c
2008-11-06 22:43:03 -08: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 drivers/net: Kill now superfluous ->last_rx stores. 2008-11-03 21:11:17 -08:00
ali-ircc.h
au1k_ir.c drivers/net: Kill now superfluous ->last_rx stores. 2008-11-03 21:11:17 -08:00
au1000_ircc.h
donauboe.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
donauboe.h
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
girbil-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
irda-usb.c drivers/net: Kill now superfluous ->last_rx stores. 2008-11-03 21:11:17 -08:00
irda-usb.h
irtty-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
irtty-sir.h
Kconfig
kingsun-sir.c drivers/net: Kill now superfluous ->last_rx stores. 2008-11-03 21:11:17 -08:00
ks959-sir.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-06 22:43:03 -08:00
ksdazzle-sir.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-06 22:43:03 -08:00
litelink-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
ma600-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
Makefile
mcp2120-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
mcs7780.c drivers/net: Kill now superfluous ->last_rx stores. 2008-11-03 21:11:17 -08:00
mcs7780.h
nsc-ircc.c drivers/net: Kill now superfluous ->last_rx stores. 2008-11-03 21:11:17 -08:00
nsc-ircc.h
old_belkin-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
pxaficp_ir.c drivers/net: Kill now superfluous ->last_rx stores. 2008-11-03 21:11:17 -08:00
sa1100_ir.c drivers/net: Kill now superfluous ->last_rx stores. 2008-11-03 21:11:17 -08:00
sir-dev.h
sir_dev.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
sir_dongle.c remove CONFIG_KMOD from drivers 2008-10-17 02:38:35 +11:00
smsc-ircc2.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
smsc-ircc2.h
smsc-sio.h
stir4200.c drivers/net: Kill now superfluous ->last_rx stores. 2008-11-03 21:11:17 -08: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: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
via-ircc.h
vlsi_ir.c drivers/net: Kill now superfluous ->last_rx stores. 2008-11-03 21:11:17 -08:00
vlsi_ir.h irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
w83977af.h
w83977af_ir.c drivers/net: Kill now superfluous ->last_rx stores. 2008-11-03 21:11:17 -08:00
w83977af_ir.h