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)
commite129fdb9b2dc49e7be62eb1626ae8b8c84f41c59
tree532c34b1ca14d56b36bf899ba82170eec6864b7e
parentafda768f88555a19bbcf66264d9fa622f78ff4fb
parentcdf61240e11f838705b7a3f51acad5b641e54210
Merge branch 'omap-for-v4.1/ocp2scp' into omap-for-v4.1/fixes-not-urgent