From: Tony Lindgren <tony@atomide.com>
Date: Fri, 5 Dec 2008 17:40:54 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.28-davinci1-diff-base~87
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18dd4f865fc2fa5ade67b994af86a250df9b2dbb;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

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

18dd4f865fc2fa5ade67b994af86a250df9b2dbb
Reading git-diff-tree failed