Merge branch 'pci/yinghai-misc' into next
Bjorn Helgaas [Mon, 24 Sep 2012 23:24:11 +0000 (17:24 -0600)]
1  2 
arch/ia64/pci/pci.c
drivers/gpu/vga/vgaarb.c
drivers/pci/probe.c

Simple merge
Simple merge
Simple merge