Merge tag 'xtensa-20170202' of git://github.com/jcmvbkbc/linux-xtensa
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Feb 2017 20:39:10 +0000 (12:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Feb 2017 20:39:10 +0000 (12:39 -0800)
commite4178c75049c581114998a850ecdfa5a2811cde6
tree30ad09d949e58d32a4c0aa0a70bc1819a26d820d
parentf2557779e1a9cfbf69c99b74da26cc1b2b10e752
parent4b3e6f2ef3722f1a6a97b6034ed492c1a21fd4ae
Merge tag 'xtensa-20170202' of git://github.com/jcmvbkbc/linux-xtensa

Pull Xtensa fix from Max Filippov:
 "A for an Xtensa build error introduced in reset code refactoring
  series in v4.9:

   - fix noMMU build on cores with MMU"

* tag 'xtensa-20170202' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: fix noMMU build on cores with MMU
arch/xtensa/kernel/setup.c