| commit | 0f6662a49bf1b5a163ed4e6321c382d2390c817b | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Fri Jun 22 15:32:50 2012 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Fri Jun 22 15:32:50 2012 -0600 |
| tree | f52d6d047c37ce78af25a0db7e4f54737d023fe4 | |
| parent | 1693c4276d768464058f191998e035e09ceb9e65 [diff] | |
| parent | 809a3bf9f34cb6d0c0383b31b3495fa1ed3508a6 [diff] |
Merge branch 'topic/bjorn-trivial' into next * topic/bjorn-trivial: PCI: remove useless pcix_set_mmrbc() dev->bus check PCI: acpiphp: check whether _ADR evaluation succeeded PCI: shpchp: remove dead code PCI: fix P2P bridge I/O port window sign extension PCI: fix upstream P2P bridge checks when enabling OBFF and LTR PCI: use __weak consistently PCI: cleanup assign_requested_resources_sorted() kernel-doc warning sparc/PCI: remove unused pcibios_assign_resource() definition