From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Feb 2012 00:57:40 +0000 (-0800)
Subject: Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
X-Git-Tag: v3.3-rc3~27
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3.3.0-rc2-00110-gd125666;p=karo-tx-linux.git

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7314/1: kuser: consistently use usr_ret for returning from helpers
  ARM: 7302/1: Add TLB flushing for both entries in a PMD
  ARM: 7303/1: perf: add empty NODE event definitions for Cortex-A5 and Cortex-A15
  ARM: 7308/1: vfp: flush thread hwstate before copying ptrace registers
  ARM: 7307/1: vfp: fix ptrace regset modification race
  ARM: 7306/1: vfp: flush thread hwstate before restoring context from sigframe
  Revert "ARM: 7304/1: ioremap: fix boundary check when reusing static mapping"
---

d12566674c2d8d1275e197c01b44b481de42eda9