From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Dec 2016 17:33:16 +0000 (-0800)
Subject: Merge tag 'nios2-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan... 
X-Git-Tag: v4.13~1664
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=70f56cbbdc4ffccbea77e6f51ce9afcbda5fc20f;p=mirror_ubuntu-bionic-kernel.git

Merge tag 'nios2-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2

Pull arch/nios2 updates from Ley Foon Tan:

 - add screen_info

 - Convert pfn_valid to static inline

 - Extend !__ASSEMBLY__ section in asm/page.h

* tag 'nios2-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: add screen_info
  nios2: Convert pfn_valid to static inline
  nios2: Extend !__ASSEMBLY__ section in asm/page.h
---

70f56cbbdc4ffccbea77e6f51ce9afcbda5fc20f