Merge tag 'nios2-fixes-v3.19' of git://git.rocketboards.org/linux-socfpga-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Dec 2014 00:13:40 +0000 (16:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Dec 2014 00:13:40 +0000 (16:13 -0800)
commit39757e7351f874a614a46d634c415ca69e154e53
treef0e41ec08cf1af121b82cc51fc14cc3ce98336de
parent66dcff86ba40eebb5133cccf450878f2bba102ef
parentf1f2eac9124bf0dc82b652871f9a596bce2d3e10
Merge tag 'nios2-fixes-v3.19' of git://git.rocketboards.org/linux-socfpga-next

Pull arch/nios2 fixes from Ley Foon Tan:
 - add definition of ioremap_wc to io.h to fix build error from make
   allmodconfig
 - fix make defconfig
 - fix sparse error

* tag 'nios2-fixes-v3.19' of git://git.rocketboards.org/linux-socfpga-next:
  nios2/uaccess: fix sparse errors
  nios2: enable "make defconfig"
  nios2: add definition of ioremap_wc to io.h