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

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_governor.c
Simple merge

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

diff --cc init/Kconfig
Simple merge

diff --cc kernel/futex.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv6/icmp.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge