From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Mar 2015 16:23:30 +0000 (-0700)
Subject: Merge tag 'nios2-fix-4.0-rc4' of git://git.rocketboards.org/linux-socfpga-next
X-Git-Tag: firefly_0821_release~176^2~2172
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5627511205e474f960d37a6242749c6964993836;p=firefly-linux-kernel-4.4.55.git

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

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

5627511205e474f960d37a6242749c6964993836