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

diff --cc Makefile
Simple merge

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

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

diff --cc include/crypto/internal/hash.h
Simple merge

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

diff --cc kernel/cgroup.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge