From: Len Brown <len.brown@intel.com>
Date: Sat, 19 Sep 2009 06:05:34 +0000 (-0400)
Subject: Merge branch 'ec' into release
X-Git-Tag: v2.6.32-rc1~171^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=762caf0baafc657c410b9c04f4a95d4e3aa4dda1;p=pandora-kernel.git

Merge branch 'ec' into release

Conflicts:
	drivers/acpi/ec.c

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

762caf0baafc657c410b9c04f4a95d4e3aa4dda1
Reading git-diff-tree failed