Merge tag 'nios2-fixes-v3.19-rc6' of git://git.rocketboards.org/linux-socfpga-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Jan 2015 18:52:14 +0000 (06:52 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Jan 2015 18:52:14 +0000 (06:52 +1200)
commitfcb237317f225f5bae1ab72a42f1f5a9c57ba3d5
tree8148b2195ee0d487d1d7b8c8d2f4b65b0e597eb6
parent193934123c84fa168d0326aa6ab8d58cd173b32a
parentd24c8163b755be4a47482ab8240090d56ca8ef9b
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