From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 10 Jul 2012 03:02:44 +0000 (-0600)
Subject: Merge branch 'pci/bjorn-disable-decode' into next
X-Git-Tag: v3.6-rc1~112^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d68e70c6e59ad08feca291c2790164d3231c425e;p=linux.git

Merge branch 'pci/bjorn-disable-decode' into next

* pci/bjorn-disable-decode:
  PCI: disable MEM decoding while updating 64-bit MEM BARs
  PCI: leave MEM and IO decoding disabled during 64-bit BAR sizing, too
---

d68e70c6e59ad08feca291c2790164d3231c425e