diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-18 23:05:06 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-18 23:05:06 -0600 |
| commit | 649ae75286793304130e747efa7d1a88daaf7e2e (patch) | |
| tree | c8afcb15a81f8211b3d5e114f834b9dbf5b17eaa /include/acpi | |
| parent | 6de8eee17a324a4fd8d1a4588a18e976b68f330c (diff) | |
| parent | ce6eacb07e287c0c3c8b5c316a9a7f9cecf69e95 (diff) | |
| parent | 6a73336bde293741026614135419e9b76afb9145 (diff) | |
Merge branch 'pci/vga'; commit '6a73336bde29' into for-linus
* pci/vga:
vgaarb: Drop obsolete #ifndef
vgaarb: Don't default exclusively to first video device with mem+io
* commit '6a73336bde29':
PCI: Remove "no hotplug settings from platform" warning