android_kernel_xiaomi_sm8350/drivers/net/irda
David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c
2010-04-11 14:53:53 -07:00
..
act200l-sir.c
actisys-sir.c
ali-ircc.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
ali-ircc.h
au1k_ir.c
au1000_ircc.h
bfin_sir.c
bfin_sir.h include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
donauboe.c
donauboe.h
ep7211-sir.c
esi-sir.c
girbil-sir.c
irda-usb.c net/irda: remove trailing space in messages 2010-03-24 14:01:55 -07:00
irda-usb.h
irtty-sir.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
irtty-sir.h
Kconfig net/irda: Add SuperH IrDA driver support 2010-04-06 19:50:21 -07:00
kingsun-sir.c
ks959-sir.c
ksdazzle-sir.c
litelink-sir.c
ma600-sir.c
Makefile net/irda: Add SuperH IrDA driver support 2010-04-06 19:50:21 -07:00
mcp2120-sir.c
mcs7780.c
mcs7780.h
nsc-ircc.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
nsc-ircc.h
old_belkin-sir.c
pxaficp_ir.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sa1100_ir.c
sh_irda.c net/irda: Add SuperH IrDA driver support 2010-04-06 19:50:21 -07:00
sh_sir.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
sir_dev.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sir_dongle.c
sir-dev.h
smsc-ircc2.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
smsc-ircc2.h
smsc-sio.h
stir4200.c
tekram-sir.c
toim3232-sir.c
via-ircc.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
via-ircc.h
vlsi_ir.c net/irda: remove trailing space in messages 2010-03-24 14:01:55 -07:00
vlsi_ir.h
w83977af_ir.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
w83977af_ir.h
w83977af.h