summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-07-14 06:16:38 +0200
committerLen Brown <len.brown@intel.com>2011-07-14 06:16:38 +0200
commit7fb574a97f7147610c44cef55d0cde2409392a80 (patch)
tree5743047d3efb8535167b8c1b177dd8e9518208c8 /include/acpi
parentACPI: Fixes device power states array overflow (diff)
parentACPI, APEI, HEST, Detect duplicated hardware error source ID (diff)
parentACPI: Fix lockdep false positives in acpi_power_off() (diff)
downloadlinux-7fb574a97f7147610c44cef55d0cde2409392a80.tar.xz
linux-7fb574a97f7147610c44cef55d0cde2409392a80.zip
Merge branches 'd3cold', 'bugzilla-37412' and 'bugzilla-38152' into release