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)
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


Trivial merge