From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Sep 2017 16:41:38 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88... 
X-Git-Tag: v4.14-rc1~153
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6caffe21ddeaae4a9d18d46eed2445a8d269a1fe;p=users%2Fwilly%2Fxarray.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha

Pull alpha updates from Matt Turner:
 "This contains some small clean up patches I've neglected, and some
  build improvements from Ben Hutchings"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: math-emu: Fix modular build
  alpha: Restore symbol versions for symbols exported from assembly
  alpha: defconfig: Cleanup from old Kconfig options
  alpha: use kobj_to_dev()
  alpha: squash lines for immediate return
  alpha: kernel: Use vma_pages()
  alpha: silence a buffer overflow warning
  alpha: marvel: make use of raw_spinlock variants
  alpha: cleanup: remove __NR_sys_epoll_*, leave __NR_epoll_*
  alpha: use generic fb.h
---

6caffe21ddeaae4a9d18d46eed2445a8d269a1fe