diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-28 02:59:17 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-28 02:59:17 +0200 |
commit | 4941b8f0c2b9d88e8a6dacebf8b7faf603b98368 (patch) | |
tree | 9b7e30a20c1f9d0db678f0ac10a33d2d917b49ca /net/core | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
parent | powerpc/PCI: Disable MSI/MSI-X interrupts at PCI probe time in OF case (diff) | |
download | linux-4941b8f0c2b9d88e8a6dacebf8b7faf603b98368.tar.xz linux-4941b8f0c2b9d88e8a6dacebf8b7faf603b98368.zip |
Merge tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net/core')
0 files changed, 0 insertions, 0 deletions