From: Len Brown <len.brown@intel.com>
Date: Sat, 16 Dec 2006 06:01:18 +0000 (-0500)
Subject: Pull bugfix into test branch
X-Git-Tag: v2.6.20-rc2~6^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfee47f99bc14a6d7c6b0be2284db2cef310a815;p=pandora-kernel.git

Pull bugfix into test branch

Conflicts:

	kernel/power/disk.c
---

cfee47f99bc14a6d7c6b0be2284db2cef310a815
Reading git-diff-tree failed