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

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/kernel/ptrace.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc block/partition-generic.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/fork.c
Simple merge

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

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

diff --cc mm/shmem.c
Simple merge

diff --cc mm/util.c
Simple merge