From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 31 Mar 2016 01:40:42 +0000 (-0500)
Subject: Merge tag 'nios2-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2
X-Git-Tag: v4.6-rc2~24
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1e6d88ccf41c7ef2d6c99aa5e7fb9215aa0e5423;p=linux.git

Merge tag 'nios2-v4.6-rc2' of git://git.kernel.org/pub/scm/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
---

1e6d88ccf41c7ef2d6c99aa5e7fb9215aa0e5423