Pull bugfix into test branch
authorLen Brown <len.brown@intel.com>
Sat, 16 Dec 2006 06:01:18 +0000 (01:01 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 16 Dec 2006 06:01:18 +0000 (01:01 -0500)
Conflicts:

kernel/power/disk.c


Trivial merge