From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Mar 2011 15:25:53 +0000 (-0700)
Subject: Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=200460067d19db4aab7f1d9f5c95dd644d260337;p=linux.git

Merge branch 'idle-release' of git://git./linux/kernel/git/lenb/linux-idle-2.6

* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  intel_idle: Rename cpuidle states
---

200460067d19db4aab7f1d9f5c95dd644d260337