Merge branch 'bjorn-pci-root-v4-2.6.35' into release
authorLen Brown <len.brown@intel.com>
Fri, 28 May 2010 20:17:16 +0000 (16:17 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 28 May 2010 20:17:16 +0000 (16:17 -0400)
commitdc1544ea5d6dfdf29440295788e639e4b44c605a
treefd4a26e78c32a43a7eb59860774f7f960f91a60c
parent6e320ec1d98f9eb93d5b2a5d70e2f40dce923f1b
parent57283776b2b821ba4d592f61cad04d0293412740
Merge branch 'bjorn-pci-root-v4-2.6.35' into release
arch/x86/pci/acpi.c
drivers/acpi/pci_root.c