David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c include/linux/inetdevice.h The inetdevice.h conflict involves moving the IPV4_DEVCONF values into a UAPI header, overlapping additions of some new entries. The iwlwifi conflict is a context overlap. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-08-26 16:37:08 -04:00
..
act200l-sir.c
actisys-sir.c
ali-ircc.c
ali-ircc.h
au1k_ir.c
bfin_sir.c	net: irda: remove unnecessary platform_set_drvdata()	2013-05-27 22:34:51 -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
irtty-sir.h
Kconfig
kingsun-sir.c
ks959-sir.c
ksdazzle-sir.c
litelink-sir.c
ma600-sir.c
Makefile
mcp2120-sir.c
mcs7780.c
mcs7780.h
nsc-ircc.c
nsc-ircc.h
old_belkin-sir.c
pxaficp_ir.c	net: irda: pxaficp_ir: use platform_set_drvdata()	2013-08-21 20:51:10 -07:00
sa1100_ir.c
sh_irda.c	net: irda: remove unnecessary platform_set_drvdata()	2013-05-27 22:34:51 -07:00
sh_sir.c	net: irda: remove unnecessary platform_set_drvdata()	2013-05-27 22:34:51 -07:00
sir_dev.c
sir_dongle.c
sir-dev.h
smsc-ircc2.c
smsc-ircc2.h
smsc-sio.h
stir4200.c
tekram-sir.c
toim3232-sir.c
via-ircc.c	via-ircc: don't return zero if via_ircc_open() failed	2013-08-20 13:27:28 -07:00
via-ircc.h
vlsi_ir.c
vlsi_ir.h
w83977af_ir.c
w83977af_ir.h
w83977af.h