aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2012-08-03 00:31:23 -0400
committerLen Brown <len.brown@intel.com>2012-08-03 00:31:23 -0400
commit9d0b01a1bbb7a4ad23000240b67bca33c4235fcf (patch)
treeeb167e785105f34e47fba5ced43dbe441c9f5d85 /drivers/acpi
parent3f6f49c7854c9294119437a82c5b35be78f9cea6 (diff)
parentb7db60f45d74497c723dc7ae1370cf0b37dfb0d8 (diff)
parent095adbb6441172985f5ddc3b9e88cb3191bdeac4 (diff)
parent2d9c86774756193edff2a2a9077264f666c626de (diff)
downloadlinux-linaro-stable-9d0b01a1bbb7a4ad23000240b67bca33c4235fcf.tar.gz
Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base