]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'pci/host-hv' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 15 Mar 2016 13:56:16 +0000 (08:56 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 15 Mar 2016 13:56:16 +0000 (08:56 -0500)
* pci/host-hv:
  PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs
  PCI: Look up IRQ domain by fwnode_handle
  PCI: Add fwnode_handle to x86 pci_sysdata

1  2 
MAINTAINERS
arch/x86/include/asm/pci.h
drivers/pci/Kconfig
drivers/pci/host/Makefile
drivers/pci/probe.c
include/linux/pci.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
index b23449902a17d2dc6facf12817925449327a708a,1e34d211389a2dbd902a2e206a8fec6a88b88193..c4e1eff8b07c27aa4b6d7b8a31a2e7c5d8795f46
@@@ -15,6 -15,8 +15,7 @@@
  #include <linux/pci-aspm.h>
  #include <linux/aer.h>
  #include <linux/acpi.h>
 -#include <asm-generic/pci-bridge.h>
+ #include <linux/irqdomain.h>
  #include "pci.h"
  
  #define CARDBUS_LATENCY_TIMER 176     /* secondary latency timer */
Simple merge