update
Merge branch 'master' of https://github.com/olegk0/xf86-video-fbdev
update