From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Apr 2018 17:18:02 +0000 (-0700)
Subject: Merge tag 'microblaze-4.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze
X-Git-Tag: v4.17-rc1~42
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=07820c3bf17822361b25f1015125fd407d9925ed;p=linux-block.git

Merge tag 'microblaze-4.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze

Pull microblaze updates from Michal Simek:
 "Use generic pci_mmap_resource_range()"

* tag 'microblaze-4.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Use generic pci_mmap_resource_range()
  microblaze: Provide pgprot_device/writecombine macros for nommu
---

07820c3bf17822361b25f1015125fd407d9925ed