Merge tag 'nios2-fix-4.0-rc4' of git://git.rocketboards.org/linux-socfpga-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Mar 2015 16:23:30 +0000 (09:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Mar 2015 16:23:30 +0000 (09:23 -0700)
Pull arch/nios2 fix from Ley Foon Tan:
 "Remove pt_regs from user header and use generic ucontext.h"

* tag 'nios2-fix-4.0-rc4' of git://git.rocketboards.org/linux-socfpga-next:
  nios2: update pt_regs


Trivial merge