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

diff --cc arch/x86/Kconfig
Simple merge

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

diff --cc drivers/md/dm-cache-target.c
Simple merge

diff --cc drivers/md/dm-snap.c
Simple merge

diff --cc fs/fs-writeback.c
Simple merge

diff --cc include/linux/cgroup-defs.h
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

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

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

diff --cc kernel/watchdog.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge