• Linus Torvalds's avatar
    Merge tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 0a582821
    Linus Torvalds authored
    Pull fbdev updates from Tomi Valkeinen:
     - new 6x10 font
     - various small fixes and cleanups
    
    * tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (30 commits)
      fonts: Add 6x10 font
      videomode: provide dummy inline functions for !CONFIG_OF
      video/atmel_lcdfb: Introduce regulator support
      fbdev: sh_mobile_hdmi: Re-init regs before irq re-enable on resume
      framebuffer: fix screen corruption when copying
      framebuffer: fix border color
      arm, fbdev, omap2, LLVMLinux: Remove nested function from omapfb
      arm, fbdev, omap2, LLVMLinux: Remove nested function from omap2 dss
      video: fbdev: valkyriefb.c: use container_of to resolve fb_info_valkyrie from fb_info
      video: fbdev: pxafb.c: use container_of to resolve pxafb_info/layer from fb_info
      video: fbdev: cyber2000fb.c: use container_of to resolve cfb_info from fb_info
      video: fbdev: controlfb.c: use container_of to resolve fb_info_control from fb_info
      video: fbdev: sa1100fb.c: use container_of to resolve sa1100fb_info from fb_info
      video: fbdev: stifb.c: use container_of to resolve stifb_info from fb_info
      video: fbdev: sis: sis_main.c: Cleaning up missing null-terminate in conjunction with strncpy
      video: valkyriefb: Fix unused variable warning in set_valkyrie_clock()
      video: fbdev: use %*ph specifier to dump small buffers
      video: mx3fb: always enable BACKLIGHT_LCD_SUPPORT
      video: fbdev: au1200fb: delete double assignment
      video: fbdev: sis: delete double assignment
      ...
    0a582821
of_display_timing.c 6.92 KB