Merge omap4-upstream into tmp-rebuild-1255050356
authorTony Lindgren <tony@atomide.com>
Fri, 9 Oct 2009 01:06:55 +0000 (18:06 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Oct 2009 01:06:55 +0000 (18:06 -0700)
Merge branch 'omap4-upstream' into tmp-rebuild-1255050356


Trivial merge