From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 9 Nov 2012 16:59:40 +0000 (-0700)
Subject: Merge branch 'pci/misc' into next
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~34^2~14
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13a84687092f47a6d67b1b17940eb3127ae888b3;p=pandora-kernel.git

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
---

13a84687092f47a6d67b1b17940eb3127ae888b3