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

Conflicts (the ARM security fixes vs the read only kernel changes from
Google):
	arch/arm/mm/mmu.c

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc arch/arm/mm/mmu.c
index 394342d0482e0f14f75e15558b12aa6e38a23ff1,daf336fe0be89250dc82343d81681ee746abc5d9..b832135ec433b6262627ca86bf21bd57a6d94e00
--- 1/arch/arm/mm/mmu.c
--- 2/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@@ -1265,15 -1220,27 +1265,27 @@@ static void __init devicemaps_init(stru
        map.pfn = __phys_to_pfn(virt_to_phys(vectors));
        map.virtual = 0xffff0000;
        map.length = PAGE_SIZE;
+ #ifdef CONFIG_KUSER_HELPERS
        map.type = MT_HIGH_VECTORS;
 -      create_mapping(&map);
+ #else
+       map.type = MT_LOW_VECTORS;
+ #endif
 +      create_mapping(&map, false);
  
        if (!vectors_high()) {
                map.virtual = 0;
+               map.length = PAGE_SIZE * 2;
                map.type = MT_LOW_VECTORS;
 -              create_mapping(&map);
 +              create_mapping(&map, false);
        }
  
 -      create_mapping(&map);
+       /* Now create a kernel read-only mapping */
+       map.pfn += 1;
+       map.virtual = 0xffff0000 + PAGE_SIZE;
+       map.length = PAGE_SIZE;
+       map.type = MT_LOW_VECTORS;
++      create_mapping(&map, false);
+ 
        /*
         * Ask the machine support to map in the statically mapped devices.
         */

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

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

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

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

diff --cc drivers/mtd/nand/Kconfig
Simple merge

diff --cc kernel/cgroup.c
Simple merge

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