Merge remote-tracking branch 'lsk/v3.10/topic/android-fixes' into linux-linaro-lsk...

The cpufreq_interactive changes have been merged upstream and the local
version dropped.

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c

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

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/Makefile
Simple merge

diff --cc fs/proc/task_mmu.c
Simple merge

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

diff --cc mm/mempolicy.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/mprotect.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge