From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Apr 2015 14:59:07 +0000 (-0700)
Subject: Merge tag 'nios2-v4.1-rc1' of git://git.rocketboards.org/linux-socfpga-next
X-Git-Tag: v5.15~15875
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=05f0c553e2155b93a9b4edb96898458762bda867;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'nios2-v4.1-rc1' of git://git.rocketboards.org/linux-socfpga-next

Pull arch/nios2 updates from Ley Foon Tan:

 - update cache management code

 - rework trap handler with new define trap #.

 - fix on check header warning.

* tag 'nios2-v4.1-rc1' of git://git.rocketboards.org/linux-socfpga-next:
  nios2: rework cache
  nios2: Add types.h header required for __u32 type
  nios2: rework trap handler
  nios2: remove end address checking for initda
---

05f0c553e2155b93a9b4edb96898458762bda867