]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6de3c874240ca03fa57ce3b19019a543c5386d3b
treeaa6bad4575406465b88b0dfc03e1a166c363bde3
parent35be4686d93c28a0ea77101173004f26f195309e
parentd441734128b82c53948b41b0a1860db0b2c663c4
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: 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