Merge tag 'v3.10.2' into linux-linaro-lsk-android

This is the 3.10.2 stable release

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

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

diff --cc kernel/cgroup.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge