Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

diff --cc arch/arm64/mm/dma-mapping.c
Simple merge

diff --cc drivers/hid/hid-multitouch.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc fs/proc/task_mmu.c
Simple merge

diff --cc kernel/panic.c
Simple merge

diff --cc kernel/printk/printk.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sys.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc mm/mlock.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc security/commoncap.c
Simple merge