From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Oct 2014 21:22:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
X-Git-Tag: v3.18-rc1~15
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=168f07a1ea75870b3fdee3d69d978813eb1fd58d;p=linux-2.6-block.git

Merge branch 'for-linus' of git://git./linux/kernel/git/mpe/linux

Pull powerpc fix from Michael Ellerman:
 "There was a bit of a misunderstanding between us and the ARM guys in
  the device tree PCI code, which is breaking virtio on powerpc.

  This is the minimal fix until we can sort it out properly"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc/pci: Fix IO space breakage after of_pci_range_to_resource() change
---

168f07a1ea75870b3fdee3d69d978813eb1fd58d