Merge branch 'fbdev/edid'