From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 Jul 2018 01:36:20 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5723b4a3cc3a128d49346afdc156124ed95b6133;p=linux.git

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()
---

5723b4a3cc3a128d49346afdc156124ed95b6133