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
..
acpi	Merge branches 'acpi-pci-pm' and 'acpi-pci-hotplug'	2013-12-31 22:03:37 +01:00
asm-generic	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
clocksource
crypto	crypto: scatterwalk - Use sg_chain_ptr on chain entries	2013-12-09 19:58:52 +08:00
drm	drm/radeon: 0x9649 is SUMO2 not SUMO	2013-12-23 10:03:41 -05:00
dt-bindings	For the 3.13 merge window we have a couple of new drivers for the AMS	2013-11-15 16:37:40 -08:00
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-18 00:55:41 -08:00
math-emu
media	[media] videobuf2: Add support for file access mode flags for DMABUF exporting	2013-12-09 14:50:50 -02:00
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-18 00:55:41 -08:00
pcmcia
ras
rdma	IB/core: const'ify inbuf in struct ib_udata	2013-12-16 10:38:28 -08:00
rxrpc
scsi	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
sound	ALSA: memalloc.h - fix wrong truncation of dma_addr_t	2013-12-10 15:30:46 +01:00
target	target/file: Update hw_max_sectors based on current block_size	2013-12-19 00:18:54 -08:00
trace	net: Add trace events for all receive entry points, exposing more skb fields	2014-01-14 14:46:02 -08:00
uapi	bonding: add netlink attributes to slave link dev	2014-01-17 18:51:58 -08:00
video	fbdev changes for 3.13	2013-11-14 14:44:20 +09:00
xen	Bug-fixes:	2013-12-20 09:34:54 -08:00
Kbuild