projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 35a84f3 b4c7e2b)
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jul 2018 18:44:12 +0000 (11:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jul 2018 18:44:12 +0000 (11:44 -0700)
commite6ef760731ada512d7258c5ed48423144f831eab
treeb4f5abb16bace95751b5648c993559ef584e1ca6tree | snapshot
parent35a84f34cf41915a0b2d0a3688b20761580f8ce4commit | diff
parentb4c7e2bd2eb4764afe3af9409ff3b1b87116fa30commit | diff
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "A couple of small fixes this time around from Steven for an
  interaction between ftrace and kernel read-only protection, and
  Vladimir for nommu"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8780/1: ftrace: Only set kernel memory back to read-only after boot
  ARM: 8775/1: NOMMU: Use instr_sync instead of plain isb in common code
John Crispins staging tree