diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-19 14:41:11 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-19 14:41:11 +0200 |
| commit | 639bb92a1ff1aab2c455acd183f973c022275798 (patch) | |
| tree | 51355fc8ce70f9cbb39f521d2aaa6f31da2944e0 /include/linux/prefetch.h | |
| parent | cf8116c491e98b47a535348a50c94cc01770d9a3 (diff) | |
| parent | 24f2e0273f80ec262a772059e140a0adef35296d (diff) | |
Merge branch 'pm-sleep'
* pm-sleep:
x86, kaslr: boot-time selectable with hibernation
PM / hibernate: introduce "nohibernate" boot parameter
Diffstat (limited to 'include/linux/prefetch.h')
0 files changed, 0 insertions, 0 deletions