diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-22 09:28:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-22 09:28:46 -0800 |
| commit | 7c24af498f60e41b9363d3102a31f8cfa6589ca3 (patch) | |
| tree | 9a251444d3ed4d208b6cb25332c8f40e67f921de /arch/x86/kernel/vmiclock_32.c | |
| parent | f8a1af6bbc63218cabce742a7a291ac7c08bbd00 (diff) | |
| parent | 5acfac5a6473b459ed38c0edf515be030f3b5874 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: remove CONFIG_ACPI_SYSTEM
fujitsu-laptop: Use RFKILL support bitmask from firmware
x86_64: Fix S3 fail path
x86_64: acpi/wakeup_64 cleanup
battery: don't assume we are fully charged when not charging or discharging
ACPI: EC: Add delay for slow MSI controller
Diffstat (limited to 'arch/x86/kernel/vmiclock_32.c')
0 files changed, 0 insertions, 0 deletions