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

Merge current mainline tree into linux-omap tree

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

0f35065eb4b173bafe9a962235a347c36a41831b
Reading git-diff-tree failed