kernel_optimize_test/drivers/isdn
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
..
act2000
capi
divert
gigaset
hardware isdn: remove deprecated IRQF_DISABLED 2013-10-17 15:13:20 -04:00
hisax isdn: Drop big endian cpp checks from telespci and hfc_pci drivers 2014-01-06 15:50:51 -05:00
hysdn
i4l isdn: slight optimization of addr compare 2013-12-26 13:31:34 -05:00
icn isdn: icn: NULL dereference printing error message 2013-11-07 19:11:13 -05:00
isdnloop isdnloop: use strlcpy() instead of strcpy() 2013-11-14 16:50:20 -05:00
mISDN net: rework recvmsg handler msg_name and msg_namelen logic 2013-11-20 21:52:30 -05:00
pcbit
sc isdn: use strlcpy() instead strcpy() 2013-12-18 17:53:59 -05:00
Kconfig
Makefile