Merge tag 'v3.10.9' into linux-linaro-lsk

This is the 3.10.9 stable release

diff --cc arch/arm/kernel/perf_event.c
Simple merge

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

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