Merge branch 'omap-for-v3.9/soc' into omap-for-v3.9/tmp-merge
authorTony Lindgren <tony@atomide.com>
Sun, 10 Feb 2013 04:06:09 +0000 (20:06 -0800)
committerTony Lindgren <tony@atomide.com>
Sun, 10 Feb 2013 04:06:09 +0000 (20:06 -0800)

Trivial merge