Merge branch 'omap-for-v3.11/soc' into omap-for-v3.11/tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 18 Jun 2013 11:35:02 +0000 (04:35 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 18 Jun 2013 11:35:02 +0000 (04:35 -0700)

Trivial merge