From: Tony Lindgren <tony@atomide.com>
Date: Thu, 29 Jan 2009 17:47:57 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c40ce00e32082c57070fdba39c7d7cba3228d440;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

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

c40ce00e32082c57070fdba39c7d7cba3228d440