Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jun 2010 20:04:39 +0000 (13:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jun 2010 20:04:39 +0000 (13:04 -0700)
commitb8a3c6091a2337391ed878693604d712d6420241
treeaa6bad4575406465b88b0dfc03e1a166c363bde3
parented8319e9b269ed19449432db3aefc11eb7be7376
parent85f1bb4ace038289d587bcff64128be10613f9f3
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: Eliminate us to pm ticks conversion in common path
  ACPI: Fix the incorrect calculation about C-state idle time
  ACPI: update feature-removal.txt to reflect deleted acpi=ht option
  ACPI / EC / PM: Fix names of functions that block/unblock EC transactions
  ACPI / EC / PM: Fix race between EC transactions and system suspend