Merge branch 'omap-for-v3.18/soc' into omap-for-v3.18/tmp-merge
authorTony Lindgren <tony@atomide.com>
Wed, 10 Sep 2014 03:02:25 +0000 (20:02 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 10 Sep 2014 03:02:25 +0000 (20:02 -0700)

Trivial merge