From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Dec 2014 17:44:44 +0000 (-0800)
Subject: Merge tag 'nios2-fixes-v3.19-rc3' of git://git.rocketboards.org/linux-socfpga-next
X-Git-Tag: v3.19-rc3~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a5cb2366fba7b34da285ef627ee44472235d5bee;p=users%2Fdwmw2%2Flinux.git

Merge tag 'nios2-fixes-v3.19-rc3' of git://git.rocketboards.org/linux-socfpga-next

Pull arch/nios2 fixes from Ley Foon Tan:

 - fix compilation error when enable CONFIG_PREEMPT

 - initialize cpuinfo.mmu variable supplied by the device tree

* tag 'nios2-fixes-v3.19-rc3' of git://git.rocketboards.org/linux-socfpga-next:
  nios2: Use preempt_schedule_irq
  nios2: Initialize cpuinfo.mmu
---

a5cb2366fba7b34da285ef627ee44472235d5bee