David S. Miller 6cdee2f96a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/yellowfin.c

2009-09-02 00:32:56 -07:00

..

act200l-sir.c

…

actisys-sir.c

…

ali-ircc.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

ali-ircc.h

…

au1k_ir.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-09-02 00:32:56 -07:00

au1000_ircc.h

…

bfin_sir.c

…

bfin_sir.h

…

donauboe.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

donauboe.h

…

ep7211-sir.c

…

esi-sir.c

…

girbil-sir.c

…

irda-usb.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

irda-usb.h

…

irtty-sir.c

…

irtty-sir.h

…

Kconfig

…

kingsun-sir.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

ks959-sir.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

ksdazzle-sir.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

litelink-sir.c

…

ma600-sir.c

…

Makefile

…

mcp2120-sir.c

…

mcs7780.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

mcs7780.h

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

nsc-ircc.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

nsc-ircc.h

…

old_belkin-sir.c

…

pxaficp_ir.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-09-02 00:32:56 -07:00

sa1100_ir.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-09-02 00:32:56 -07:00

sir_dev.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

sir_dongle.c

…

sir-dev.h

…

smsc-ircc2.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

smsc-ircc2.h

…

smsc-sio.h

…

stir4200.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

tekram-sir.c

…

toim3232-sir.c

…

via-ircc.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

via-ircc.h

…

vlsi_ir.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

vlsi_ir.h

…

w83977af_ir.c

irda: convert to netdev_tx_t

2009-09-01 01:13:38 -07:00

w83977af_ir.h

…

w83977af.h

…