From: Tony Lindgren <tony@atomide.com>
Date: Thu, 26 Mar 2015 17:48:49 +0000 (-0700)
Subject: Merge branch 'omap-for-v4.1/ocp2scp' into omap-for-v4.1/fixes-not-urgent
X-Git-Tag: v4.1-rc1~53^2~2^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e129fdb9b2dc49e7be62eb1626ae8b8c84f41c59;p=users%2Fwilly%2Flinux.git

Merge branch 'omap-for-v4.1/ocp2scp' into omap-for-v4.1/fixes-not-urgent
---

e129fdb9b2dc49e7be62eb1626ae8b8c84f41c59