From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Dec 2014 00:13:40 +0000 (-0800)
Subject: Merge tag 'nios2-fixes-v3.19' of git://git.rocketboards.org/linux-socfpga-next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=39757e7351f874a614a46d634c415ca69e154e53;p=openwrt%2Fstaging%2Fblogic.git

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

39757e7351f874a614a46d634c415ca69e154e53