Merge tag 'for-4.21' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jan 2019 19:35:55 +0000 (11:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jan 2019 19:35:55 +0000 (11:35 -0800)
commit670b321f4150bfc8a2261f4db3fcdab21738506b
treea1a6d5f6c19118f784ba707ef52e1815acbb4f8a
parentb23b0ea3708c3dec599966fc856836aca48835b9
parent21c7acc439b55d0569d7c2fc2eea5194b3910406
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