Skip to content
Commit cfee47f9 authored by Len Brown's avatar Len Brown
Browse files

Pull bugfix into test branch 

Conflicts:

	kernel/power/disk.c
parents 7e244322 9185cfa9
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment