Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie...
authorLen Brown <len.brown@intel.com>
Fri, 3 Aug 2012 04:31:23 +0000 (00:31 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 3 Aug 2012 04:31:23 +0000 (00:31 -0400)
commit9d0b01a1bbb7a4ad23000240b67bca33c4235fcf
treeeb167e785105f34e47fba5ced43dbe441c9f5d85
parent3f6f49c7854c9294119437a82c5b35be78f9cea6
parentb7db60f45d74497c723dc7ae1370cf0b37dfb0d8
parent095adbb6441172985f5ddc3b9e88cb3191bdeac4
parent2d9c86774756193edff2a2a9077264f666c626de
Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base
drivers/acpi/pci_root.c
drivers/acpi/processor_driver.c
drivers/acpi/sleep.c