From: Tony Lindgren <tony@atomide.com>
Date: Thu, 24 Jan 2008 23:50:05 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.24-omap1~25
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53b7b269db19a89352d4e34a13112d55ea618f42;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

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

53b7b269db19a89352d4e34a13112d55ea618f42
Reading git-diff-tree failed