Merge branch 'omap-for-v3.9/soc' into omap-for-v3.9/tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 1 Feb 2013 23:00:13 +0000 (15:00 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 1 Feb 2013 23:00:13 +0000 (15:00 -0800)

Trivial merge