summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-02-22 04:01:43 +0100
committerLen Brown <len.brown@intel.com>2009-02-22 04:01:43 +0100
commit5acfac5a6473b459ed38c0edf515be030f3b5874 (patch)
treeedeb4d26043f6147d0451e313487482ed3391b8d /arch
parentACPI: EC: Add delay for slow MSI controller (diff)
parentbattery: don't assume we are fully charged when not charging or discharging (diff)
parentACPI: remove CONFIG_ACPI_SYSTEM (diff)
parentx86_64: Fix S3 fail path (diff)
downloadlinux-5acfac5a6473b459ed38c0edf515be030f3b5874.tar.xz
linux-5acfac5a6473b459ed38c0edf515be030f3b5874.zip
Merge branches 'release', 'bugzilla-12011', 'bugzilla-12632', 'misc' and 'suspend' into release