Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next