Merge branch 'topic/jan-intx-masking' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 18 Jun 2012 18:14:16 +0000 (12:14 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 18 Jun 2012 18:14:16 +0000 (12:14 -0600)
* topic/jan-intx-masking:
  PCI: add Ralink RT2800 broken INTx masking quirk
  PCI: add Chelsio T310 10GbE NIC broken INTx masking quirk
  PCI: add infrastructure for devices with broken INTx masking

1  2 
drivers/pci/pci.c
drivers/pci/quirks.c
include/linux/pci.h

Simple merge
Simple merge
Simple merge