David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-27 16:59:56 -08:00
..
asm-generic	vfs: renumber FMODE_NONOTIFY and add to uniqueness check	2015-01-08 15:10:52 -08:00
drm	Merge tag 'drm-intel-next-2014-11-21-fixed' of git://anongit.freedesktop.org/drm-intel into drm-next	2014-12-03 08:25:59 +10:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08: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 flags for on demand paging support	2014-12-15 18:13:35 -08:00
scsi
sound	ALSA: oxfw: Add hwdep interface	2014-12-10 10:50:00 +01:00
video
xen
Kbuild	cxl: Add userspace header file	2014-10-08 20:15:57 +11:00