[GIT PULL] omap display fixes for 3.10