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

Pull trivial into test branch

Conflicts:

	drivers/acpi/ec.c
---

463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc
Reading git-diff-tree failed