David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

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

2014-01-06 17:37:45 -05:00

..

6pack.c

hamradio: 6pack: fix error return code

2014-01-02 03:30:35 -05:00

baycom_epp.c

drivers/net: rename random32() to prandom_u32()

2013-05-07 18:38:27 -07:00

baycom_par.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

baycom_ser_fdx.c

hamradio: baycom: remove deprecated IRQF_DISABLED

2013-09-30 15:08:13 -04:00

baycom_ser_hdx.c

hamradio: baycom: remove deprecated IRQF_DISABLED

2013-09-30 15:08:13 -04:00

bpqether.c

hamradio: slight optimization of addr compare

2013-12-26 13:31:33 -05:00

dmascc.c

drivers:net:misc: Remove unnecessary alloc/OOM messages

2013-02-04 13:22:35 -05:00

hdlcdrv.c

drivers/net/hamradio: Integer overflow in hdlcdrv_ioctl()

2013-12-19 15:02:14 -05:00

Kconfig

tty: Added a CONFIG_TTY option to allow removal of TTY

2013-01-18 16:15:27 -08:00

Makefile

Fix common misspellings

2011-03-31 11:26:23 -03:00

mkiss.c

drivers/net/*: Fix FSF address in file headers

2013-12-06 12:37:55 -05:00

scc.c

net: hamradio/scc: remove deprecated IRQF_DISABLED

2013-10-07 15:53:52 -04:00

yam.c

hamradio/yam: fix info leak in ioctl

2013-12-19 15:09:38 -05:00

z8530.h

…