Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

R

R128
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

42de5532

Commit 42de5532 authored 14 years ago by Len Brown

Downloads
- Plain Diff

Merge branch 'bugzilla-13931-sleep-nvs' into release


Conflicts:
	drivers/acpi/sleep.c

Signed-off-by: Len Brown <len.brown@intel.com>

parents e9e8b4dd 2a6b6976

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/kernel/e820.c 1 addition, 1 deletion

arch/x86/kernel/e820.c
drivers/acpi/sleep.c 19 additions, 15 deletions

drivers/acpi/sleep.c
include/linux/suspend.h 13 additions, 13 deletions

include/linux/suspend.h
kernel/power/Kconfig 5 additions, 4 deletions

kernel/power/Kconfig
kernel/power/Makefile 1 addition, 1 deletion

kernel/power/Makefile
kernel/power/nvs.c 12 additions, 12 deletions

kernel/power/nvs.c
kernel/power/suspend.c 6 additions, 0 deletions

kernel/power/suspend.c

with 57 additions and 46 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment