Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro...

 Remove conflictsed drivers/staging/android/logger.c

diff --cc drivers/cpuidle/governors/menu.c
Simple merge

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

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

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

diff --cc security/selinux/ss/policydb.c
Simple merge