]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e822a00 0bdb3b2)
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 patch | diff1 | diff2 | blob | history
drivers/pci/quirks.c patch | diff1 | diff2 | blob | history
include/linux/pci.h patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/pci.c
Simple merge
diff --cc drivers/pci/quirks.c
Simple merge
diff --cc include/linux/pci.h
Simple merge
local clone of linux.git