Merge tag 'nios2-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Dec 2016 17:33:16 +0000 (09:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Dec 2016 17:33:16 +0000 (09:33 -0800)
commit70f56cbbdc4ffccbea77e6f51ce9afcbda5fc20f
treeaee10162f35b757bf88d2a7dd0151abcf3ddc7ac
parentde399813b521ea7e38bbfb5e5b620b5e202e5783
parent744606c76c4a3a73eb34d21f265013426426c4b5
Merge tag 'nios2-v4.10-rc1' of git://git./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