Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
	arch/arm/mm/proc-v7.S

diff --cc arch/arm/mm/proc-v7.S
index 2dcafbe,785365e..290b34f
--- 1/arch/arm/mm/proc-v7.S
--- 2/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@@ -382,12 -382,18 +382,24 @@@ __v7_setup
        mcr     p15, 0, r5, c10, c2, 0          @ write PRRR
        mcr     p15, 0, r6, c10, c2, 1          @ write NMRR
  #endif
 +
 +#ifdef CONFIG_USER_PMON
 +      mov     r0, #1
 +      mcr     p15, 0, r0, c9, c14, 0
 +#endif
 +
+ #ifndef CONFIG_ARM_THUMBEE
+       mrc     p15, 0, r0, c0, c1, 0           @ read ID_PFR0 for ThumbEE
+       and     r0, r0, #(0xf << 12)            @ ThumbEE enabled field
+       teq     r0, #(1 << 12)                  @ check if ThumbEE is present
+       bne     1f
+       mov     r5, #0
+       mcr     p14, 6, r5, c1, c0, 0           @ Initialize TEEHBR to 0
+       mrc     p14, 6, r0, c0, c0, 0           @ load TEECR
+       orr     r0, r0, #1                      @ set the 1st bit in order to
+       mcr     p14, 6, r0, c0, c0, 0           @ stop userspace TEEHBR access
+ 1:
+ #endif
        adr     r5, v7_crval
        ldmia   r5, {r5, r6}
  #ifdef CONFIG_CPU_ENDIAN_BE8

diff --cc security/commoncap.c
Simple merge