Merge branch 'omap-for-v4.1/ocp2scp' into omap-for-v4.1/fixes-not-urgent
authorTony Lindgren <tony@atomide.com>
Thu, 26 Mar 2015 17:48:49 +0000 (10:48 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 26 Mar 2015 17:48:49 +0000 (10:48 -0700)

Trivial merge