David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-05 20:32:02 -05:00
..
asm-generic	asm-generic: add sched_setattr/sched_getattr syscalls	2014-02-24 11:55:20 +00:00
drm	Merge tag 'vmwgfx-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux into drm-fixes	2014-02-19 08:21:02 +10:00
linux	UAPI: add MPLS label stack definition	2014-03-04 13:51:06 -05:00
mtd	mtd: mtd-abi: add a helper to detect the nand type	2013-10-27 16:27:06 -07:00
rdma	IB/core: Re-enable create_flow/destroy_flow uverbs	2013-11-17 08:22:09 -08:00
scsi	…
sound	ALSA: compress: add num_sample_rates in snd_codec_desc	2014-01-07 18:33:40 +01:00
video	…
xen	xen: install xen/gntdev.h and xen/gntalloc.h	2014-02-11 10:12:36 -05:00
Kbuild	…