Merge branch 'pandora-27-omap1' into pandora-27-omap1_rework