Pull bugfix into test branch

Conflicts:

	kernel/power/disk.c
This commit is contained in:
Len Brown 2006-12-16 01:01:18 -05:00
commit cfee47f99b
3 changed files with 14 additions and 12 deletions