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

diff --cc Makefile
Simple merge

diff --cc arch/arm64/include/asm/uaccess.h
Simple merge

diff --cc drivers/md/Kconfig
Simple merge

diff --cc fs/ext4/crypto_fname.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

diff --cc fs/ext4/readpage.c
Simple merge

diff --cc fs/f2fs/inline.c
Simple merge

diff --cc kernel/fork.c
Simple merge

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

diff --cc kernel/sched/sched.h
Simple merge