Merge tag 'openrisc-for-linus-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2016 18:14:47 +0000 (10:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2016 18:14:47 +0000 (10:14 -0800)
commit17ce1b201d8309ca9e23c063660a789fe3798704
tree8c390e999a6694388c2eb78dd57fb8e7a0579ff0
parent8cebec469b8b42359a2dcf9715bf74c49a755f6d
parent2c7a5c5c48d97ce3105f3258a259f67b7b9d7eb1
Merge tag 'openrisc-for-linus-v4.9-rc5' of git://git./linux/kernel/git/groeck/linux-staging

Pull openrisc fix from Guenter Roeck:
 "Fix openrisc crash caused by ro_init changes"

* tag 'openrisc-for-linus-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  openrisc: Define __ro_after_init to avoid crash