From: Tony Lindgren <tony@atomide.com>
Date: Wed, 30 Sep 2009 19:11:46 +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~16^2^2~9
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb3f0670d7321efaf364fc40a96fdf5a2a7014f9;p=pandora-kernel.git

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

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

eb3f0670d7321efaf364fc40a96fdf5a2a7014f9
Reading git-diff-tree failed