diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-09 09:59:40 -0700 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-09 09:59:40 -0700 |
commit | 13a84687092f47a6d67b1b17940eb3127ae888b3 (patch) | |
tree | 6d6766e6f7721729f60dd4f72fd93c19f97f2248 /drivers/pci/probe.c | |
parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
parent | 6e965e0d0e1d102c261326b06338d3385ea55f97 (diff) | |
download | linux-3.10-13a84687092f47a6d67b1b17940eb3127ae888b3.tar.gz linux-3.10-13a84687092f47a6d67b1b17940eb3127ae888b3.tar.bz2 linux-3.10-13a84687092f47a6d67b1b17940eb3127ae888b3.zip |
Merge branch 'pci/misc' into next
* pci/misc:
PCI/PM: Add comments for PME poll support for PCIe
PCI: Add PLX PCI 9050 workaround for some Meilhaus DAQ cards
PCI: Add workaround for PLX PCI 9050 BAR alignment erratum
PCI: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
x86/PCI: Ignore _SEG on HP xw9300
PCI: Don't touch card regs after runtime suspend D3
Diffstat (limited to 'drivers/pci/probe.c')
0 files changed, 0 insertions, 0 deletions