diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-15 14:17:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-15 14:17:52 -0400 |
| commit | 5a4179460cb50d939a2ae713cf88fcbff75f2c1c (patch) | |
| tree | f41bfc36bbb14be449aaeecf01df592a5fd553f4 /drivers/char/tpm/Makefile | |
| parent | 5d7cb157025b3b4852f38e6e5e97d06ef12c1d78 (diff) | |
| parent | 4725fd3ce970c27a1678fb0809bfc7c2f4ac3e4f (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: recognize Lincroft Atom Processor
intel_idle: no longer EXPERIMENTAL
intel_idle: disable module support
intel_idle: add support for Westmere-EX
intel_idle: delete power_policy modparam, and choose substate functions
intel_idle: delete substates DEBUG modparam
Diffstat (limited to 'drivers/char/tpm/Makefile')
0 files changed, 0 insertions, 0 deletions