David S. Miller 7c3ceb4a40 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-3945.c net/mac80211/mlme.c		2008-07-08 16:30:17 -07:00
..
act200l-sir.c
actisys-sir.c
ali-ircc.c
ali-ircc.h	irda: Remove useless pm_dev references	2008-07-08 03:08:16 -07:00
au1k_ir.c
au1000_ircc.h	irda: Remove useless pm_dev references	2008-07-08 03:08:16 -07:00
donauboe.c	irda: remove CVS keywords	2008-06-11 21:00:41 -07:00
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	irda: New device ID for nsc-ircc	2008-07-08 03:07:16 -07:00
nsc-ircc.h
old_belkin-sir.c
pxaficp_ir.c
sa1100_ir.c
sir_dev.c
sir_dongle.c
sir-dev.h
smsc-ircc2.c	irda: remove CVS keywords	2008-06-11 21:00:41 -07:00
smsc-ircc2.h	irda: remove CVS keywords	2008-06-11 21:00:41 -07:00
smsc-sio.h
stir4200.c
tekram-sir.c
toim3232-sir.c
via-ircc.c	irda: via-ircc proper dma freeing	2008-07-08 03:06:46 -07:00
via-ircc.h	irda: Remove useless pm_dev references	2008-07-08 03:08:16 -07:00
vlsi_ir.c
vlsi_ir.h
w83977af_ir.c
w83977af_ir.h
w83977af.h