]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
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


Trivial merge