]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Jan 2018 04:12:47 +0000 (20:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Jan 2018 04:12:47 +0000 (20:12 -0800)
Pull alpha fixes from Matt Turner:
 "A build fix and a regression fix"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha/PCI: Fix noname IRQ level detection
  alpha: extend memset16 to EV6 optimised routines


Trivial merge