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)
1  2 
drivers/pci/setup-bus.c

Simple merge