Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Mar 2011 15:25:53 +0000 (08:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Mar 2011 15:25:53 +0000 (08:25 -0700)
commit200460067d19db4aab7f1d9f5c95dd644d260337
tree19fc0a5ad95109bf1407e2be41caa91f69963cff
parent047f61c5d16d617e1df2deea5c5d5fb2a1b41c95
parent15e123e5d7e8ee9ba3717e743d8eb5fd0fe57712
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