Alex Shi 2120557722 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ... Conflicts: arch/arm64/kernel/armv8_deprecated.c arch/arm64/kernel/efi.c arch/arm64/kernel/entry.S arch/arm64/kernel/head.S arch/arm64/kernel/hw_breakpoint.c arch/arm64/mm/mmu.c include/linux/memblock.h mm/memblock.c		2017-07-11 16:22:22 +08:00
..
asm-generic	mm: mlock: add mlock flags to enable VM_LOCKONFAULT usage	2015-11-05 19:34:48 -08:00
drm	Merge tag 'topic/drm-fixes-2015-11-11' of git://anongit.freedesktop.org/drm-intel into drm-fixes	2015-11-13 09:54:31 +10:00
linux	Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android	2017-07-11 16:22:22 +08:00
misc	cxl: Add alternate MMIO error handling	2015-08-18 19:34:43 +10:00
mtd	mtd: mtd-user: remove stdint.h include	2015-10-19 18:19:06 -07:00
rdma	Initial 4.4 merge window submission	2015-11-07 13:33:07 -08:00
scsi	cxlflash: Fix to avoid virtual LUN failover failure	2016-09-15 08:27:49 +02:00
sound	ASoC: Updates for v4.4	2015-10-26 12:14:49 +01:00
video	video: adf: ensure consistent alignment on userspace facing structs	2016-02-16 13:53:19 -08:00
xen	xen/gntdev: use types from linux/types.h in userspace headers	2015-10-23 14:20:45 +01:00
Kbuild	cxl: Add userspace header file	2014-10-08 20:15:57 +11:00