Merge branch 'topic/stratus' into next
Bjorn Helgaas [Mon, 7 May 2012 15:23:27 +0000 (09:23 -0600)]
1  2 
arch/x86/pci/common.c
drivers/pci/pci.c
drivers/pci/probe.c

Simple merge
Simple merge
Simple merge