David S. Miller 4180442058 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c net/ipv4/tcp_metrics.c Overlapping changes between the "don't create two tcp metrics objects with the same key" race fix in net and the addition of the destination address in the lookup key in net-next. Minor overlapping changes in bnx2x driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-18 00:55:41 -08:00
..
boot	arm64: dts: Reserve the memory used for secondary CPU release address	2013-11-25 16:44:04 +00:00
configs	arm64: defconfig: Enable CONFIG_PREEMPT by default	2013-11-05 10:03:53 +00:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-18 00:55:41 -08:00
kernel	arm64: ptrace: avoid using HW_BREAKPOINT_EMPTY for disabled events	2013-12-19 17:41:25 +00:00
kvm	Here are the 3.13 KVM changes. There was a lot of work on the PPC	2013-11-15 13:51:36 +09:00
lib	arm64: Treat the bitops index argument as an 'int'	2013-05-08 10:33:17 +01:00
mm	arm64: ensure completion of TLB invalidatation	2013-12-06 17:21:49 +00:00
xen	xen/arm,arm64: enable SWIOTLB_XEN	2013-10-10 13:40:44 +00:00
Kconfig	arm64: make default NR_CPUS 8	2013-12-06 17:21:50 +00:00
Kconfig.debug	arm64: Remove duplicate DEBUG_STACK_USAGE config	2013-10-02 18:03:26 +01:00
Makefile	arm64: big-endian: add big-endian support to top-level arch Makefile	2013-10-25 15:59:31 +01:00