Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ...

Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.

2010-12-22 18:57:02 +01:00

..

act200l-sir.c

…

actisys-sir.c

…

ali-ircc.c

Fix typo: configuation => configuration

2010-09-23 11:46:48 +02:00

ali-ircc.h

irda: convert to internal stats

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

au1k_ir.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

au1000_ircc.h

irda: convert to internal stats

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

bfin_sir.c

net/irda: bfin_sir: IRDA is not affected by anomaly 05000230

2010-05-23 23:57:45 -07:00

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

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

donauboe.h

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

ep7211-sir.c

…

esi-sir.c

…

girbil-sir.c

…

irda-usb.c

irda: Test index before read in stir421x_patch_device()

2010-10-11 02:11:58 +02:00

irda-usb.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

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

headers: kref.h redux

2009-09-26 10:17:19 -07:00

ks959-sir.c

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

ksdazzle-sir.c

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

litelink-sir.c

…

ma600-sir.c

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

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

Makefile

net/irda: Add SuperH IrDA driver support

2010-04-06 19:50:21 -07:00

mcp2120-sir.c

…

mcs7780.c

drivers/net/irda: Adjust confusing if indentation

2010-08-16 21:06:26 -07:00

mcs7780.h

irda: convert to netdev_tx_t

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

nsc-ircc.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

nsc-ircc.h

irda: convert to internal stats

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

old_belkin-sir.c

…

pxaficp_ir.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

sa1100_ir.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

sh_irda.c

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

2010-08-06 18:13:19 +01:00

sh_sir.c

SuperH IrDA: correct Baud rate error correction

2010-11-21 10:09:53 -08:00

sir_dev.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-10-23 11:47:02 -07:00

sir_dongle.c

…

sir-dev.h

irda: convert to internal stats

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

smsc-ircc2.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

smsc-ircc2.h

…

smsc-sio.h

…

stir4200.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

tekram-sir.c

…

toim3232-sir.c

headers: remove sched.h from interrupt.h

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

via-ircc.c

drivers/net/irda: Eliminate memory leak

2010-08-25 16:36:49 -07:00

via-ircc.h

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

vlsi_ir.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

vlsi_ir.h

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

w83977af_ir.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

w83977af_ir.h

irda: convert to internal stats

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

w83977af.h

…