Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

diff --cc kernel/fork.c
Simple merge

diff --cc mm/vmscan.c
Simple merge

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