Merge branch 'omap7xx-fortony-rc1' of git://robotfuzz.com/linwizard-kernel into omap7...
authorTony Lindgren <tony@atomide.com>
Tue, 6 Oct 2009 02:06:10 +0000 (19:06 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Oct 2009 02:06:10 +0000 (19:06 -0700)
Conflicts:
arch/arm/plat-omap/gpio.c


Trivial merge