Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Feb 2009 17:28:46 +0000 (09:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Feb 2009 17:28:46 +0000 (09:28 -0800)
commit7c24af498f60e41b9363d3102a31f8cfa6589ca3
tree9a251444d3ed4d208b6cb25332c8f40e67f921de
parentf8a1af6bbc63218cabce742a7a291ac7c08bbd00
parent5acfac5a6473b459ed38c0edf515be030f3b5874
Merge branch 'release' of git://git./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