| commit | b8a3c6091a2337391ed878693604d712d6420241 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 04 13:04:39 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 04 13:04:39 2010 -0700 |
| tree | aa6bad4575406465b88b0dfc03e1a166c363bde3 | |
| parent | ed8319e9b269ed19449432db3aefc11eb7be7376 [diff] | |
| parent | 85f1bb4ace038289d587bcff64128be10613f9f3 [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: 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