From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Mar 2015 22:24:28 +0000 (-0700)
Subject: Merge tag 'nios2-fixes-v4.0-rc5' of git://git.rocketboards.org/linux-socfpga-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=18eda522c2eb0aaeb7fd0b4824f28d4d6c6f3363;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

18eda522c2eb0aaeb7fd0b4824f28d4d6c6f3363