]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pci/nikhil-big-bar-fixes' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 18 Jul 2012 20:06:20 +0000 (14:06 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 18 Jul 2012 20:06:20 +0000 (14:06 -0600)
* pci/nikhil-big-bar-fixes:
  PCI: reorder __pci_assign_resource() (no change)
  PCI: fix truncation of resource size to 32 bits

1  2 
drivers/pci/setup-res.c

Simple merge