From: Tony Lindgren <tony@atomide.com>
Date: Tue, 7 Oct 2008 11:27:17 +0000 (+0300)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.27-omap1~57
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=5b99e69f31fa575e53483e1f90c3a88939ca0b95

Merge current mainline tree into linux-omap tree

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

5b99e69f31fa575e53483e1f90c3a88939ca0b95