From: Tony Lindgren <tony@atomide.com>
Date: Mon, 23 Jun 2008 07:41:18 +0000 (+0300)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~122
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6a32eb134fbf2ea1d384e0bfa8e9ba6eec952817;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

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

6a32eb134fbf2ea1d384e0bfa8e9ba6eec952817