From: Len Brown <len.brown@intel.com>
Date: Wed, 16 Dec 2009 08:33:28 +0000 (-0500)
Subject: Merge branch 'dock' into release
X-Git-Tag: v2.6.33-rc1~47^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f02f465b1cdcdf7485f89ec019e6cceaf80cadd5;p=pandora-kernel.git

Merge branch 'dock' into release

Conflicts:
	drivers/acpi/dock.c

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

f02f465b1cdcdf7485f89ec019e6cceaf80cadd5
Reading git-diff-tree failed