From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 May 2018 19:44:07 +0000 (-0700)
Subject: Merge branch 'parisc-4.17-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v4.17-rc6~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6fd5a36a46c0caf288f3acd90d608ffefa17f234;p=linux-2.6-block.git

Merge branch 'parisc-4.17-5' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc fixlets from Helge Deller:
 "Three small section mismatch fixes, one of them was found by 0-day
  test infrastructure"

* 'parisc-4.17-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Move ccio_cujo20_fixup() into init section
  parisc: Move setup_profiling_timer() out of init section
  parisc: Move find_pa_parent_type() out of init section
---

6fd5a36a46c0caf288f3acd90d608ffefa17f234