From: Tony Lindgren <tony@atomide.com>
Date: Mon, 22 Sep 2008 14:26:10 +0000 (+0300)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.27-omap1~177
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ab5516a11682bdd8e38bcb6ab52ab36f301d3b4d;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/plat-omap/devices.c
---

ab5516a11682bdd8e38bcb6ab52ab36f301d3b4d