From: Tony Lindgren <tony@atomide.com>
Date: Tue, 6 Oct 2009 02:06:10 +0000 (-0700)
Subject: Merge branch 'omap7xx-fortony-rc1' of git://robotfuzz.com/linwizard-kernel into omap7... 
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~17
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62e4cf957598cdaefe8d36c0afb5c3f06def1a0f;p=pandora-kernel.git

Merge branch 'omap7xx-fortony-rc1' of git://robotfuzz.com/linwizard-kernel into omap7xx-fortony-rc1

Conflicts:
	arch/arm/plat-omap/gpio.c
---

62e4cf957598cdaefe8d36c0afb5c3f06def1a0f
Reading git-diff-tree failed