From: Len Brown <len.brown@intel.com>
Date: Sun, 29 May 2011 08:40:39 +0000 (-0400)
Subject: Merge branch 'ec-cleanup' into release
X-Git-Tag: v3.0-rc1~12^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=751516f0a9bad32544f40f471037c0e45fb639c9;p=pandora-kernel.git

Merge branch 'ec-cleanup' into release

Conflicts:
	drivers/platform/x86/compal-laptop.c
---

751516f0a9bad32544f40f471037c0e45fb639c9
Reading git-diff-tree failed