tree 73da68b86cdba0b1637207b9e0680ce65303a0d8
parent 33fe3aee03acd51fabce00e1bdf39ab5e7d10340
parent cda390bb8f0fc751194ef5f4c691ca8d3ff91009
author Linus Torvalds <torvalds@linux-foundation.org> 1405278558 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1405278558 -0700

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "Another round of fixes for ARM:
   - a set of kprobes fixes from Jon Medhurst
   - fix the revision checking for the L2 cache which wasn't noticed to
     have been broken"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: l2c: fix revision checking
  ARM: kprobes: Fix test code compilation errors for ARMv4 targets
  ARM: kprobes: Disallow instructions with PC and register specified shift
  ARM: kprobes: Prevent known test failures stopping other tests running