Merge branch 'omap7xx-fortony-rc3' of git://robotfuzz.com/linwizard-kernel into omap7xx
authorTony Lindgren <tony@atomide.com>
Mon, 12 Oct 2009 16:09:06 +0000 (09:09 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 12 Oct 2009 16:09:06 +0000 (09:09 -0700)

Trivial merge