From: Len Brown <len.brown@intel.com>
Date: Fri, 9 Jan 2009 08:37:48 +0000 (-0500)
Subject: Merge branch 'misc' into release
X-Git-Tag: v2.6.29-rc1~34^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0302bc62af7983040ea1cd1b5dd2b36e1a6a509;p=pandora-kernel.git

Merge branch 'misc' into release

Conflicts:
	include/acpi/acpixf.h

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

d0302bc62af7983040ea1cd1b5dd2b36e1a6a509
Reading git-diff-tree failed