Merge branch 'omap7xx-fortony-rc3' of git://robotfuzz.com/linwizard-kernel into tmp...
authorTony Lindgren <tony@atomide.com>
Fri, 9 Oct 2009 01:06:50 +0000 (18:06 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Oct 2009 01:06:50 +0000 (18:06 -0700)

Trivial merge