OpenCloudOS-Kernel/arch/arc
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
..
boot ARC: Add perf support for ARC700 cores 2013-11-12 09:45:38 +05:30
configs Final set of ARC changes for 3.13-rc1 2013-11-19 11:44:15 -08:00
include Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
kernel ARC: [perf] Fix a few thinkos 2013-11-28 15:49:59 +05:30
lib ARC: [lib] strchr breakage in Big-endian configuration 2013-08-24 11:24:53 -07:00
mm DeviceTree updates for 3.13. This is a bit larger pull request than 2013-11-12 16:52:17 +09:00
oprofile ARC: OProfile support 2013-02-15 23:16:00 +05:30
plat-arcfpga Couple of Platform updates (Device Tree files primarily) given that the 2013-07-10 10:11:26 -07:00
plat-tb10x ARC: [TB10x] Updates for GPIO and pinctrl 2013-11-11 09:57:44 +05:30
Kbuild ARC: Build system: Makefiles, Kconfig, Linker script 2013-02-11 20:00:25 +05:30
Kconfig ARC: extable: Enable sorting at build time 2013-11-25 10:35:23 +05:30
Kconfig.debug consolidate per-arch stack overflow debugging options 2013-07-04 11:25:39 -07:00
Makefile ARC: Adjustments for gcc 4.8 2013-06-27 14:35:32 +05:30