From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Jan 2015 18:52:14 +0000 (+1200)
Subject: Merge tag 'nios2-fixes-v3.19-rc6' of git://git.rocketboards.org/linux-socfpga-next
X-Git-Tag: firefly_0821_release~176^2~2483
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fcb237317f225f5bae1ab72a42f1f5a9c57ba3d5;p=firefly-linux-kernel-4.4.55.git

Merge tag 'nios2-fixes-v3.19-rc6' of git://git.rocketboards.org/linux-socfpga-next

Pull one arch/nios2 fix from Ley Foon Tan:
 "Fix kuser trampoline address"

* tag 'nios2-fixes-v3.19-rc6' of git://git.rocketboards.org/linux-socfpga-next:
  nios2: fix kuser trampoline address
---

fcb237317f225f5bae1ab72a42f1f5a9c57ba3d5