Merge branch 'pci/bjorn-disable-decode' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 10 Jul 2012 03:02:44 +0000 (21:02 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 10 Jul 2012 03:02:44 +0000 (21:02 -0600)
* 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

1  2 
drivers/pci/probe.c

Simple merge