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

diff --cc drivers/cpufreq/Makefile
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc mm/mempolicy.c
Simple merge