Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 May 2018 15:18:33 +0000 (08:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 May 2018 15:18:33 +0000 (08:18 -0700)
Pull alpha fixes from Matt Turner:
 "A few small changes for alpha"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: io: reorder barriers to guarantee writeX() and iowriteX() ordering #2
  alpha: simplify get_arch_dma_ops
  alpha: use dma_direct_ops for jensen


Trivial merge