Merge tag 'nios2-v4.1-rc1' of git://git.rocketboards.org/linux-socfpga-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Apr 2015 14:59:07 +0000 (07:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Apr 2015 14:59:07 +0000 (07:59 -0700)
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


Trivial merge