From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Jan 2019 19:35:55 +0000 (-0800)
Subject: Merge tag 'for-4.21' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux
X-Git-Tag: v5.15~7236
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=670b321f4150bfc8a2261f4db3fcdab21738506b;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-4.21' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux

Pull h8300 fix from Yoshinori Sato:
 "Build problem fix"

* tag 'for-4.21' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux:
  h8300: pci: Remove local declaration of pcibios_penalize_isa_irq
---

670b321f4150bfc8a2261f4db3fcdab21738506b