From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 22 Jun 2012 21:32:50 +0000 (-0600)
Subject: Merge branch 'topic/bjorn-trivial' into next
X-Git-Tag: v3.6-rc1~112^2~13
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f6662a49bf1b5a163ed4e6321c382d2390c817b;p=pandora-kernel.git

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

0f6662a49bf1b5a163ed4e6321c382d2390c817b