Merge branch 'omap-for-v3.8/soc' into omap-for-v3.8/tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 9 Nov 2012 23:23:22 +0000 (15:23 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Nov 2012 23:23:22 +0000 (15:23 -0800)

Trivial merge