Merge tag 'nios2-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Mar 2016 01:40:42 +0000 (20:40 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Mar 2016 01:40:42 +0000 (20:40 -0500)
commit1e6d88ccf41c7ef2d6c99aa5e7fb9215aa0e5423
tree62f5250921c403703c7050f44d33fd2dafce899e
parent62f444e0548eb503b42c8447675b468f5cf40c69
parent8fe889274c7a4d95c3e2d06f87ead499ea6faa2d
Merge tag 'nios2-v4.6-rc2' of git://git./linux/kernel/git/lftan/nios2

Pull nios2 fix from Ley Foon Tan:
 "Replace fdt_translate_address with of_flat_dt_translate_address"

Fixes a build failure.

* tag 'nios2-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: Replace fdt_translate_address with of_flat_dt_translate_address