diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 23:10:15 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 23:10:15 +0200 |
| commit | 97b80e685ffae9a6dc946ab08ed32f1eafda97d7 (patch) | |
| tree | 96baa368706662230b1aa98b3f83d8425aef46b8 /fs/cifs/smb1ops.c | |
| parent | 91ab377ba3ab202c40a0da402d6c2f1507a15355 (diff) | |
| parent | 9051785f6928456db0692b8ca972778b9bf42099 (diff) | |
| download | linux-97b80e685ffae9a6dc946ab08ed32f1eafda97d7.tar.bz2 | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
PM / suspend: Always use deepest C-state in the "freeze" sleep state
cpuidle / menu: move repeated correction factor check to init
cpuidle / menu: Return (-1) if there are no suitable states
cpuidle: Combine cpuidle_enabled() with cpuidle_select()
ARM: clps711x: Add cpuidle driver
Diffstat (limited to 'fs/cifs/smb1ops.c')
0 files changed, 0 insertions, 0 deletions