Merge branch 'omap7xx-fortony-rc1' of git://robotfuzz.com/linwizard-kernel
authorTony Lindgren <tony@atomide.com>
Mon, 28 Sep 2009 21:30:32 +0000 (14:30 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 28 Sep 2009 21:30:32 +0000 (14:30 -0700)
Conflicts:
arch/arm/plat-omap/gpio.c


Trivial merge