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

diff --cc drivers/net/tun.c
Simple merge

diff --cc fs/dcache.c
Simple merge

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

diff --cc mm/memcontrol.c
Simple merge

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

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

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