David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_3ad.h drivers/net/bonding/bond_main.c Two minor conflicts in bonding, both of which were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-02-19 01:24:22 -05:00
..
asm-generic	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-01-29 18:22:16 -08: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-02-19 01:24:22 -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	FCoE Updates for 3.9	2013-03-01 09:10:08 +00:00
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