Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ...

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

2010-03-08 16:55:37 +01:00

..

act200l-sir.c

irda: replace __FUNCTION__ with __func__

2008-07-30 17:20:18 -07:00

actisys-sir.c

irda: replace __FUNCTION__ with __func__

2008-07-30 17:20:18 -07:00

ali-ircc.c

irda: convert to netdev_tx_t

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

ali-ircc.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

au1k_ir.c

MIPS: Alchemy: devboard register abstraction

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

au1000_ircc.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

bfin_sir.c

net/irda: convert bfin_sir to net_device_ops

2009-06-29 19:41:49 -07:00

bfin_sir.h

irda: new Blackfin on-chip SIR IrDA driver

2009-06-13 01:56:02 +02:00

donauboe.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

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

donauboe.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

ep7211-sir.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

esi-sir.c

…

girbil-sir.c

irda: replace __FUNCTION__ with __func__

2008-07-30 17:20:18 -07:00

irda-usb.c

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

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

irda-usb.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

irtty-sir.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

irtty-sir.h

…

Kconfig

net/irda: sh_sir: Add SuperH IrDA driver

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

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

irda: replace __FUNCTION__ with __func__

2008-07-30 17:20:18 -07:00

ma600-sir.c

drivers/net/irda: fix sparse warnings: make symbols static

2008-12-26 00:03:19 -08:00

Makefile

net/irda: sh_sir: Add SuperH IrDA driver

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

mcp2120-sir.c

irda: replace __FUNCTION__ with __func__

2008-07-30 17:20:18 -07:00

mcs7780.c

headers: kref.h redux

2009-09-26 10:17:19 -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

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

old_belkin-sir.c

irda: replace __FUNCTION__ with __func__

2008-07-30 17:20:18 -07:00

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

tree-wide: Assorted spelling fixes

2010-02-09 11:13:56 +01:00

sh_sir.c

net/irda: sh_sir: Add SuperH IrDA driver

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

sir_dev.c

irda: convert to netdev_tx_t

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

sir_dongle.c

remove CONFIG_KMOD from drivers

2008-10-17 02:38:35 +11:00

sir-dev.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

smsc-ircc2.c

comment typo fix: sybsystem -> subsystem

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

smsc-ircc2.h

irda: remove CVS keywords

2008-06-11 21:00:41 -07:00

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

irda: replace __FUNCTION__ with __func__

2008-07-30 17:20:18 -07:00

toim3232-sir.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

via-ircc.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

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

via-ircc.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

vlsi_ir.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

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

vlsi_ir.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

w83977af_ir.c

irda: convert to netdev_tx_t

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

w83977af_ir.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

w83977af.h

…