From: Len Brown <len.brown@intel.com>
Date: Thu, 23 Oct 2008 03:25:26 +0000 (-0400)
Subject: Merge branch 'dock' into test
X-Git-Tag: v2.6.28-rc1~26^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47bf31adc541bef0c20de15e800e0011f1ae70c7;p=pandora-kernel.git

Merge branch 'dock' into test

Conflicts:
	drivers/acpi/osl.c

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

47bf31adc541bef0c20de15e800e0011f1ae70c7
Reading git-diff-tree failed