Merge tag 'microblaze-v4.18-rc1' of git://git.monstr.eu/linux-2.6-microblaze
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jun 2018 17:20:19 +0000 (10:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jun 2018 17:20:19 +0000 (10:20 -0700)
commitc0ab85267e25e34ce8b7e4429f0ef01fa0795b80
tree26bdf432b4812e67ffd6cf4abe08c4bb9cc2dddc
parentd987f62cce3289e42b83eb6c110c4745ea781bdf
parenta7a9e2f0410ddf9ec7491fca0c91fcb4c5c30cbb
Merge tag 'microblaze-v4.18-rc1' of git://git.monstr.eu/linux-2.6-microblaze

Pull microblaze updates from Michal Simek:

 - Fix simpleImage format generation

 - Remove earlyprintk support and replace it by earlycon

* tag 'microblaze-v4.18-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: dts: replace 'linux,stdout-path' with 'stdout-path'
  microblaze: remove redundant early_printk support
  microblaze: remove unnecessary prom.h includes
  microblaze: Fix simpleImage format generation
arch/microblaze/include/asm/pci.h