Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jan 2014 01:26:00 +0000 (08:26 +0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jan 2014 01:26:00 +0000 (08:26 +0700)
commit9826dbb1e9bdea2aa909a152733c663a8c773754
tree60c932482f35a0426881cc15aa4e34795ce6602f
parent70b23ce347c025a06339abd995b1df4a9fe096ba
parentb25f3e1c358434bf850220e04f28eebfc45eb634
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "Another few fixes for ARM, nothing major here"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 7938/1: OMAP4/highbank: Flush L2 cache before disabling
  ARM: 7939/1: traps: fix opcode endianness when read from user memory
  ARM: 7937/1: perf_event: Silence sparse warning
  ARM: 7934/1: DT/kernel: fix arch_match_cpu_phys_id to avoid erroneous match
  Revert "ARM: 7908/1: mm: Fix the arm_dma_limit calculation"
arch/arm/mach-highbank/highbank.c
arch/arm/mach-omap2/omap4-common.c