summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-07-14 08:16:38 +0400
committerLen Brown <len.brown@intel.com>2011-07-14 08:16:38 +0400
commit7fb574a97f7147610c44cef55d0cde2409392a80 (patch)
tree5743047d3efb8535167b8c1b177dd8e9518208c8 /include/acpi
parentb4a03b9aa96cc186bf3cfd7a55cb7d7227f0cf4d (diff)
parent4d2b2956ef1113f1cc43e98e947c20d9c7d2712c (diff)
parent07e49a7a31153a95caa270d8ad7350a0bcd4d511 (diff)
downloadlinux-7fb574a97f7147610c44cef55d0cde2409392a80.tar.xz
Merge branches 'd3cold', 'bugzilla-37412' and 'bugzilla-38152' into release