Merge tag 'omapdss-for-3.5' of git://github.com/tomba/linux into fbdev-next