tree 2974594b06534c199ea9c4b39492d5a708bb539a
parent 7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c
parent 9185cfa92507d07ac787bc73d06c42222eec7239
author Len Brown <len.brown@intel.com> 1166248878 -0500
committer Len Brown <len.brown@intel.com> 1166248878 -0500

Pull bugfix into test branch

Conflicts:

	kernel/power/disk.c