Merge branch 'omap-for-v3.11/soc' into omap-for-v3.11/tmp-merge
authorTony Lindgren <tony@atomide.com>
Mon, 10 Jun 2013 03:47:11 +0000 (20:47 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 10 Jun 2013 03:47:11 +0000 (20:47 -0700)

Trivial merge