Merge branch 'be-armv7-omap' into be-armv7