David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
acpi	Merge branch 'acpica'	2013-11-27 01:03:27 +01:00
asm-generic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
clocksource
crypto	crypto: scatterwalk - Use sg_chain_ptr on chain entries	2013-12-09 19:58:52 +08:00
drm	Merge branch 'ttm-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes	2013-11-21 18:46:56 +10: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	2013-12-18 16:42:06 -05: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	2013-12-18 16:42:06 -05:00
pcmcia
ras
rdma	Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next	2013-11-17 08:22:19 -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_core_alua: Store supported ALUA states	2013-11-20 11:26:37 -08:00
trace	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-12-02 10:13:09 -08:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
video	fbdev changes for 3.13	2013-11-14 14:44:20 +09:00
xen	Features:	2013-11-15 13:34:37 +09:00
Kbuild