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

Merge branch 'drivers-platform' into release

Conflicts:
	drivers/misc/Kconfig

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

d97c0defba25a959a990f6d4759f43075540832e
Reading git-diff-tree failed