Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Jul 2018 01:36:20 +0000 (18:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Jul 2018 01:36:20 +0000 (18:36 -0700)
commit5723b4a3cc3a128d49346afdc156124ed95b6133
tree255b2c4b488179dbeaa862157ff36fdbf7988fd9
parentd512584780d3e6a7cacb2f482834849453d444a1
parent12be1036c536f849ad6f9bba73cffa708aa965c3
Merge git://git./linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Some small __init annotation and build fixes from Stephen Rostedt and
  Thomas Petazzoni"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: use asm-generic version of msi.h
  sparc: move MSI related definitions to where they are used
  sparc/time: Add missing __init to init_tick_ops()