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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc kernel/power/process.c
Simple merge

diff --cc kernel/time/alarmtimer.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc mm/shmem.c
Simple merge

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

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

diff --cc net/ipv4/tcp.c
index 59e8bbc04d95ac24c0c0331c128700bfa78f4003,5d4bd6ca3ab1e46cb02322dfecc563ac053484d9..4619ae6c5d50c393a99eb4a533e90a9f3b3f781c
--- 1/net/ipv4/tcp.c
--- 2/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@@ -1242,10 -1238,8 +1242,11 @@@ wait_for_memory
  out:
        if (copied)
                tcp_push(sk, flags, mss_now, tp->nonagle);
+ out_nopush:
        release_sock(sk);
 +
 +      if (copied + copied_syn)
 +              uid_stat_tcp_snd(current_uid(), copied + copied_syn);
        return copied + copied_syn;
  
  do_fault:

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

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