From: Tony Lindgren <tony@atomide.com>
Date: Mon, 29 Dec 2008 08:51:06 +0000 (+0200)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.28-omap1~52
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=401b285465488f515290e0f9111872b94e1cf922

Merge current mainline tree into linux-omap tree

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

401b285465488f515290e0f9111872b94e1cf922