summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-09-12 20:00:00 -0400
committerLen Brown <len.brown@intel.com>2011-09-12 20:00:00 -0400
commit38c0a0c9ae0d145d72c6865f4aec1107aef81310 (patch)
tree3ea959043369e36363cafe3540b9ebb2f79ad0f2 /drivers/acpi
parentb6fd41e29dea9c6753b1843a77e50433e6123bcb (diff)
parent03ba176a29dae5b4849f45c0b5c89b9d78baa2c6 (diff)
parentb33c25d6a62ac253caabda2b5f43258abff451c0 (diff)
parent96242116d483cd98ab55fb989ca096f6f9cc3738 (diff)
Merge branches 'apei', 'bz-13195' and 'doc' into acpi