Merge branch 'omap7xx-fortony-rc1' of git://robotfuzz.com/linwizard-kernel into omap7...
authorTony Lindgren <tony@atomide.com>
Wed, 30 Sep 2009 19:11:46 +0000 (12:11 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 30 Sep 2009 19:11:46 +0000 (12:11 -0700)
Conflicts:
arch/arm/plat-omap/gpio.c


Trivial merge