David S. Miller 24bc518a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/iwlwifi/pcie/tx.c Minor iwlwifi conflict in TX queue disabling between 'net', which removed a bogus warning, and 'net-next' which added some status register poking code. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-11-25 12:49:17 -05:00
..
act200l-sir.c
actisys-sir.c
ali-ircc.c	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
ali-ircc.h
au1k_ir.c	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
bfin_sir.c	drivers: net: irda: bfin_sir: fix compile error	2012-08-08 15:40:25 -07:00
bfin_sir.h
donauboe.c
donauboe.h
ep7211-sir.c
esi-sir.c
girbil-sir.c
irda-usb.c
irda-usb.h
irtty-sir.c	drivers/net/irda/irtty-sir.c: fix error return code	2012-10-07 14:37:10 -04:00
irtty-sir.h
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-05-22 19:22:50 -07:00
kingsun-sir.c
ks959-sir.c	drivers/net/irda: fix error return code	2012-08-20 02:33:21 -07:00
ksdazzle-sir.c	drivers/net/irda: fix error return code	2012-08-20 02:33:21 -07:00
litelink-sir.c
ma600-sir.c
Makefile
mcp2120-sir.c
mcs7780.c	drivers/net/irda/mcs7780.c: fix error return code	2012-10-07 14:37:11 -04:00
mcs7780.h
nsc-ircc.c
nsc-ircc.h
old_belkin-sir.c
pxaficp_ir.c	drivers/net/irda/pxaficp_ir.c: fix error return code	2012-10-07 14:37:11 -04:00
sa1100_ir.c	drivers/net/irda/sa1100_ir.c: fix error return code	2012-10-07 14:37:11 -04:00
sh_irda.c	irda: sh-irda: Remove SH7377 support	2012-11-08 21:59:35 -05:00
sh_sir.c	drivers/net/irda/sh_sir.c: fix error return code	2012-10-07 14:37:11 -04:00
sir-dev.h
sir_dev.c	irda: sir_dev: Fix copy/paste typo	2012-11-20 15:51:55 -05:00
sir_dongle.c
smsc-ircc2.c
smsc-ircc2.h
smsc-sio.h
stir4200.c
tekram-sir.c
toim3232-sir.c
via-ircc.c
via-ircc.h
vlsi_ir.c
vlsi_ir.h
w83977af.h
w83977af_ir.c
w83977af_ir.h