From: Tony Lindgren <tony@atomide.com>
Date: Fri, 31 Oct 2008 21:27:36 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.28-davinci1-diff-base~202
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=946deb792b95c6a263ceffddf61885c1dad2012b;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

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

946deb792b95c6a263ceffddf61885c1dad2012b
Reading git-diff-tree failed