From: Tony Lindgren <tony@atomide.com>
Date: Thu, 13 Mar 2008 08:59:16 +0000 (+0200)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.25-omap1~140
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6b3be844fa5ba6aa4bc6947d30102d13190451e9;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/configs/omap_h2_1610_defconfig
	arch/arm/configs/omap_osk_5912_defconfig
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap2/io.c
	arch/arm/plat-omap/cpu-omap.c
	arch/arm/plat-omap/gpio.c
---

6b3be844fa5ba6aa4bc6947d30102d13190451e9