Merge tag 'nios2-v4.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Aug 2018 21:51:32 +0000 (14:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Aug 2018 21:51:32 +0000 (14:51 -0700)
commitff81a521b888728e7ece69a437ac4d9ea810b6c6
tree1cba6b502522a15da7d2b9d40c5c047ac74b135b
parentb4df50de6ab66e41b3b8d8acf3ce45c632084163
parentc7c09dc187f0323ad40b5b6c57a6db673a386a7f
Merge tag 'nios2-v4.19-rc2' of git://git./linux/kernel/git/lftan/nios2

Pull nios2 fix from Ley Foon Tan:
 "remove duplicate DEBUG_STACK_USAGE symbol defintions"

* tag 'nios2-v4.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: kconfig: remove duplicate DEBUG_STACK_USAGE symbol defintions