tree c1597da9080aa6ef26c646f4c781a0f7b68da603
parent 7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f
parent 5a97d0ae5b5d78727b87965cba84194a9f1e06ce
author Linus Torvalds <torvalds@linux-foundation.org> 1328317060 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1328317060 -0800

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"