Len Brown cfee47f99b Pull bugfix into test branch
Conflicts:

	kernel/power/disk.c
2006-12-16 01:01:18 -05:00
..
2006-12-16 01:01:18 -05:00
2006-12-16 01:01:18 -05:00
2006-12-07 08:39:28 -08:00
2006-12-07 08:39:28 -08:00
2006-12-07 08:39:28 -08:00
2006-12-07 08:39:28 -08:00