tree f8fca436f994c67d992accea8987ce40bd282bed
parent ca92e6c7e6329029d7188487a5c32e86ef471977
parent 90f92c631b210c1e97080b53a9d863783281a932
author Linus Torvalds <torvalds@linux-foundation.org> 1484767172 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1484767172 -0800

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

Pull ARM fixes from Russell King:
 "A few ARM fixes:

   - fix a crash while performing TLB maintanence on early ARM SMP cores

   - blacklist Scorpion CPUs for hardware breakpoints

   - ARMs asm/types.h has been included as part of the UAPI due to the
     way the makefiles work, move it to uapi/asm/types.h to make it
     official

   - fix up ftrace syscall name matching"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8613/1: Fix the uaccess crash on PB11MPCore
  MAINTAINERS: update rmk's entries
  ARM: put types.h in uapi
  ARM: 8634/1: hw_breakpoint: blacklist Scorpion CPUs
  ARM: 8632/1: ftrace: fix syscall name matching