From: Tony Lindgren 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: firefly_0821_release~176^2~1891^2~3^2~4 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e129fdb9b2dc49e7be62eb1626ae8b8c84f41c59;p=firefly-linux-kernel-4.4.55.git Merge branch 'omap-for-v4.1/ocp2scp' into omap-for-v4.1/fixes-not-urgent --- e129fdb9b2dc49e7be62eb1626ae8b8c84f41c59