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

diff --cc arch/arm64/Makefile
Simple merge

diff --cc arch/x86/mm/mmap.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc drivers/char/random.c
Simple merge

diff --cc fs/dcache.c
Simple merge

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

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge