From: Tony Lindgren <tony@atomide.com>
Date: Sat, 12 Apr 2008 00:32:10 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.25-omap1~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b87501204757e7c2deeddd94f4941b3e1dfd9a27;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

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

b87501204757e7c2deeddd94f4941b3e1dfd9a27
Reading git-diff-tree failed