Merge branch 'omap2-upstream' into devel