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

diff --cc kernel/cpu.c
Simple merge

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

diff --cc kernel/sysctl.c
Simple merge