David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-08-26 16:37:08 -04:00

..

act200l-sir.c

…

actisys-sir.c

…

ali-ircc.c

drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0)

2013-03-17 12:50:24 -04:00

ali-ircc.h

…

au1k_ir.c

net: au1k_ir: Use module_platform_driver()

2013-03-20 13:25:36 -04:00

bfin_sir.c

net: irda: remove unnecessary platform_set_drvdata()

2013-05-27 22:34:51 -07:00

bfin_sir.h

net/irda: convert bfin_sir to common Blackfin UART header

2011-05-24 01:13:11 -04:00

donauboe.c

donauboe: replace excessive udelay with msleep

2012-04-21 15:28:47 -04:00

donauboe.h

…

ep7211-sir.c

irda: ep7211-sir: Convert to platform_diver

2012-12-03 13:32:15 -05:00

esi-sir.c

…

girbil-sir.c

…

irda-usb.c

USB: irda-usb.c: remove err() usage

2012-04-25 14:48:49 -07:00

irda-usb.h

…

irtty-sir.c

TTY: move low_latency to tty_port

2013-01-15 22:23:16 -08:00

irtty-sir.h

…

Kconfig

tty/serial patches for 3.9-rc1

2013-02-21 13:41:04 -08:00

kingsun-sir.c

USB: kingsun-sir.c: remove err() usage

2012-04-25 14:48:50 -07:00

ks959-sir.c

drivers/net/irda: fix error return code

2012-08-20 02:33:21 -07:00

ksdazzle-sir.c

drivers/net/irda: fix error return code

2012-08-20 02:33:21 -07:00

litelink-sir.c

…

ma600-sir.c

…

Makefile

…

mcp2120-sir.c

…

mcs7780.c

drivers/net/irda/mcs7780.c: fix error return code

2012-10-07 14:37:11 -04:00

mcs7780.h

…

nsc-ircc.c

drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0)

2013-03-17 12:50:24 -04:00

nsc-ircc.h

…

old_belkin-sir.c

…

pxaficp_ir.c

net: irda: pxaficp_ir: use platform_set_drvdata()

2013-08-21 20:51:10 -07:00

sa1100_ir.c

drivers/net/irda/sa1100_ir.c: fix error return code

2012-10-07 14:37:11 -04:00

sh_irda.c

net: irda: remove unnecessary platform_set_drvdata()

2013-05-27 22:34:51 -07:00

sh_sir.c

net: irda: remove unnecessary platform_set_drvdata()

2013-05-27 22:34:51 -07:00

sir_dev.c

irda: sir_dev: Fix copy/paste typo

2012-11-20 15:51:55 -05:00

sir_dongle.c

…

sir-dev.h

…

smsc-ircc2.c

drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0)

2013-03-17 12:50:24 -04:00

smsc-ircc2.h

…

smsc-sio.h

…

stir4200.c

USB: stir4200.c: remove err() usage

2012-04-25 14:48:51 -07:00

tekram-sir.c

…

toim3232-sir.c

treewide: transciever/transceiver spelling fixes

2011-06-24 11:20:14 +02:00

via-ircc.c

via-ircc: don't return zero if via_ircc_open() failed

2013-08-20 13:27:28 -07:00

via-ircc.h

drivers/net: Remove unnecessary semicolons

2011-06-05 14:33:40 -07:00

vlsi_ir.c

proc: Supply PDE attribute setting accessor functions

2013-05-01 17:29:18 -04:00

vlsi_ir.h

…

w83977af_ir.c

drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0)

2013-03-17 12:50:24 -04:00

w83977af_ir.h

…

w83977af.h

…