Merge branch '3.18/omapdss-fixes' into 3.18/fbdev-fixes