David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
asm-generic	vfs: renumber FMODE_NONOTIFY and add to uniqueness check	2015-01-08 15:10:52 -08:00
drm	Merge tag 'topic/drm-misc-2015-02-06' of git://anongit.freedesktop.org/drm-intel into drm-next	2015-02-11 15:33:02 +10:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
misc	cxl: Add documentation for userspace APIs	2014-10-08 20:16:19 +11:00
mtd	mtd: lpddr: add driver for LPDDR2-NVM PCM memories	2014-05-20 17:45:17 -07:00
rdma	IB/core: Add on demand paging caps to ib_uverbs_ex_query_device	2015-02-18 08:36:26 -08:00
scsi	FCoE Updates for 3.9	2013-03-01 09:10:08 +00:00
sound	ALSA: usx2y: Move UAPI definition into include/uapi/sound/usb_stream.h	2015-01-28 17:33:49 +01:00
video	UAPI: (Scripted) Disintegrate include/video	2012-12-20 17:14:26 +00:00
xen	xen: install xen/gntdev.h and xen/gntalloc.h	2014-02-11 10:12:36 -05:00
Kbuild	cxl: Add userspace header file	2014-10-08 20:15:57 +11:00