David S. Miller 47871889c6 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/firmware/iscsi_ibft.c

2010-02-28 19:23:06 -08:00

..

act200l-sir.c

…

actisys-sir.c

…

ali-ircc.c

…

ali-ircc.h

…

au1k_ir.c

MIPS: Alchemy: devboard register abstraction

2010-02-27 12:52:50 +01:00

au1000_ircc.h

…

bfin_sir.c

…

bfin_sir.h

…

donauboe.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

donauboe.h

…

ep7211-sir.c

…

esi-sir.c

…

girbil-sir.c

…

irda-usb.c

drivers/net: Move && and || to end of previous line

2009-12-03 13:18:01 -08:00

irda-usb.h

…

irtty-sir.c

…

irtty-sir.h

…

Kconfig

net/irda: sh_sir: Add SuperH IrDA driver

2010-02-02 07:47:56 -08:00

kingsun-sir.c

…

ks959-sir.c

…

ksdazzle-sir.c

…

litelink-sir.c

…

ma600-sir.c

…

Makefile

net/irda: sh_sir: Add SuperH IrDA driver

2010-02-02 07:47:56 -08:00

mcp2120-sir.c

…

mcs7780.c

…

mcs7780.h

…

nsc-ircc.c

…

nsc-ircc.h

…

old_belkin-sir.c

…

pxaficp_ir.c

…

sa1100_ir.c

…

sh_sir.c

net/irda: sh_sir: Add SuperH IrDA driver

2010-02-02 07:47:56 -08:00

sir_dev.c

…

sir_dongle.c

…

sir-dev.h

…

smsc-ircc2.c

comment typo fix: sybsystem -> subsystem

2009-12-04 15:39:49 +01:00

smsc-ircc2.h

…

smsc-sio.h

…

stir4200.c

drivers/net: Move && and || to end of previous line

2009-12-03 13:18:01 -08:00

tekram-sir.c

…

toim3232-sir.c

…

via-ircc.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

via-ircc.h

…

vlsi_ir.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

vlsi_ir.h

…

w83977af_ir.c

…

w83977af_ir.h

…

w83977af.h

…