Merge branch 'soc' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 6 Mar 2012 22:19:27 +0000 (14:19 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Mar 2012 22:19:27 +0000 (14:19 -0800)

Trivial merge