Merge branch 'bjorn-pci-root-v4-2.6.35' into release
Len Brown [Fri, 28 May 2010 20:17:16 +0000 (16:17 -0400)]
1  2 
arch/x86/pci/acpi.c
drivers/acpi/pci_root.c

Simple merge
Simple merge