Merge omapdss topic branch for fbdev 4.1