From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Jun 2010 20:04:39 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b8a3c6091a2337391ed878693604d712d6420241;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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
---

b8a3c6091a2337391ed878693604d712d6420241