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

diff --cc arch/arm64/kernel/entry.S
Simple merge

diff --cc arch/arm64/kernel/traps.c
Simple merge

diff --cc drivers/mtd/nand/Kconfig
Simple merge

diff --cc fs/fuse/dev.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc mm/mempolicy.c
Simple merge