Merge with branch 'v2.6.27-omap1' of OMAP git