Merge tag 'for-linus' of git://github.com/openrisc/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Jan 2019 23:35:55 +0000 (15:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Jan 2019 23:35:55 +0000 (15:35 -0800)
commitfbea8c7c793397cdf4ba53a32f99b656467b7c7f
tree974405ff6b7e0b7cbf80e35a66b35bfbbc97b46d
parent28e8c4bc8eb483c22d977e147a0b98fc63efadf7
parent57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff
Merge tag 'for-linus' of git://github.com/openrisc/linux

Pull OpenRISC update from Stafford Horne:
 "Just one change for 4.21: Update comments for name change or32 -> or1k
  from Geert Uytterhoeven"

* tag 'for-linus' of git://github.com/openrisc/linux:
  openrisc: Fix broken paths to arch/or32