| commit | 200460067d19db4aab7f1d9f5c95dd644d260337 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 24 08:25:53 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 24 08:25:53 2011 -0700 |
| tree | 19fc0a5ad95109bf1407e2be41caa91f69963cff | |
| parent | 047f61c5d16d617e1df2deea5c5d5fb2a1b41c95 [diff] | |
| parent | 15e123e5d7e8ee9ba3717e743d8eb5fd0fe57712 [diff] |
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/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