From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Aug 2015 00:59:17 +0000 (-0700)
Subject: Merge tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: android-x86-6.0-r1~865
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4941b8f0c2b9d88e8a6dacebf8b7faf603b98368;p=android-x86%2Fkernel.git

Merge tag 'powerpc-4.2-4' of git://git./linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:
 "Fix MSI/MSI-X on pseries from Guilherme"

* tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/PCI: Disable MSI/MSI-X interrupts at PCI probe time in OF case
  PCI: Make pci_msi_setup_pci_dev() non-static for use by arch code
---

4941b8f0c2b9d88e8a6dacebf8b7faf603b98368