Merge tag 'nios2-fixes-v4.0-rc5' of git://git.rocketboards.org/linux-socfpga-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Mar 2015 22:24:28 +0000 (15:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Mar 2015 22:24:28 +0000 (15:24 -0700)
commit18eda522c2eb0aaeb7fd0b4824f28d4d6c6f3363
treed56d83600dc52937197abe4719a69c9345557545
parenta93fc153b1485120ee0abd9bfcae38460e6c00e6
parent6347e2a10f7031dc3725e6f4519089517c0ca521
Merge tag 'nios2-fixes-v4.0-rc5' of git://git.rocketboards.org/linux-socfpga-next

Pull two arch/nios2 fixes from Ley Foon Tan:
 - Remove ucontext.h from exported arch headers
 - nios2: mm: do not invoke OOM killer on kernel fault OOM

* tag 'nios2-fixes-v4.0-rc5' of git://git.rocketboards.org/linux-socfpga-next:
  nios2: mm: do not invoke OOM killer on kernel fault OOM
  nios2: Remove ucontext.h from exported arch headers