David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig		2009-11-18 22:19:03 -08:00
..
act200l-sir.c
actisys-sir.c
ali-ircc.c
ali-ircc.h
au1k_ir.c
au1000_ircc.h
bfin_sir.c
bfin_sir.h
donauboe.c
donauboe.h
ep7211-sir.c
esi-sir.c
girbil-sir.c
irda-usb.c	drivers/net/irda: remove exceptional & on function name	2009-11-18 10:48:40 -08:00
irda-usb.h
irtty-sir.c
irtty-sir.h
Kconfig
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
mcp2120-sir.c
mcs7780.c	headers: kref.h redux	2009-09-26 10:17:19 -07:00
mcs7780.h
nsc-ircc.c
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
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	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
via-ircc.c
via-ircc.h
vlsi_ir.c
vlsi_ir.h
w83977af_ir.c
w83977af_ir.h
w83977af.h