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

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

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

diff --cc net/unix/af_unix.c
Simple merge