From: Tony Lindgren <tony@atomide.com>
Date: Fri, 19 Dec 2008 08:39:33 +0000 (+0200)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.28-davinci1-diff-base~52
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52a8b74cc5548c38e9d1328d75dbc5fc671dd261;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
---

52a8b74cc5548c38e9d1328d75dbc5fc671dd261
Reading git-diff-tree failed