From: Len Brown <len.brown@intel.com>
Date: Sun, 5 Apr 2009 05:48:46 +0000 (-0400)
Subject: Merge branch 'async-battery' into release
X-Git-Tag: v2.6.30-rc1~199^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59b17bf6ea06abed519dfc788fff1b6b9499d23f;p=pandora-kernel.git

Merge branch 'async-battery' into release

Conflicts:
	drivers/acpi/Makefile

Signed-off-by: Len Brown <len.brown@intel.com>
---

59b17bf6ea06abed519dfc788fff1b6b9499d23f
Reading git-diff-tree failed