linux-hardened/include/uapi
David S. Miller f6d3125fa3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/dsa/slave.c

net/dsa/slave.c simply had overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-02 07:21:25 -07:00
..
asm-generic userfaultfd: register uapi generic syscall (aarch64) 2015-09-22 15:09:53 -07:00
drm uapi/drm/i915_drm.h: fix userspace compilation. 2015-09-02 16:26:58 +03:00
linux Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-02 07:21:25 -07:00
misc cxl: Add alternate MMIO error handling 2015-08-18 19:34:43 +10:00
mtd mtd: lpddr: add driver for LPDDR2-NVM PCM memories 2014-05-20 17:45:17 -07:00
rdma IB/hfi1: Add PSM2 user space header to header_install 2015-09-03 15:29:52 -04:00
scsi cxlflash: Virtual LUN support 2015-08-26 18:05:39 -07:00
sound ASoC: Disable topology support for v4.2 2015-08-19 18:31:54 +02:00
video
xen xen/privcmd: Further s/MFN/GFN/ clean-up 2015-09-08 18:03:54 +01:00
Kbuild cxl: Add userspace header file 2014-10-08 20:15:57 +11:00