From: Tony Lindgren <tony@atomide.com>
Date: Wed, 21 Nov 2007 01:17:21 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.24-omap1~195
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7a23afa6c836ae1775ceeaef64aee96df46fd9d5;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

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