Merge branch 'pci-next+probe_only+bus2res-fb127cb' of git://github.com/bjorn-helgaas...
authorJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 24 Feb 2012 22:25:33 +0000 (14:25 -0800)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 24 Feb 2012 22:25:33 +0000 (14:25 -0800)
commitecd58d667a6ac4350d2f67b9accaadf575bae4b0
tree5209771a0a1f61820171e444d3e4a580ecf3955f
parentb07f2ebc109b607789f648dedcff4b125f9afec6
parentfb127cb9de791d62fb393d6e65fa9869bddd2460
Merge branch 'pci-next+probe_only+bus2res-fb127cb' of git://github.com/bjorn-helgaas/linux into linux-next
drivers/pci/setup-bus.c