Skip to content
  • Linus Torvalds's avatar
    Merge branch 'fbdev-fixes-for-linus' of... · e5fa5061
    Linus Torvalds authored
    Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
    
    * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
      sisfb: delete osdef.h
      sisfb: move the CONFIG warning to sis_main.c
      sisfb: replace SiS_SetMemory with memset_io
      sisfb: remove InPort/OutPort wrappers
      sisfb: use CONFIG_FB_SIS_301/315 instead of SIS301/315H
      sisfb: delete redudant #define SIS_LINUX_KERNEL
      sisfb: delete dead SIS_XORG_XF86 code
      sisfb: delete fallback code for pci_map_rom()
      sisfb: delete obsolete PCI ROM bug workaround
      fbdev: Update documentation index file.
      lxfb: Program panel v/h sync output polarity correctly
      fbcmap: integer overflow bug
      fbcmap: cleanup white space in fb_alloc_cmap()
      MAINTAINERS: Add fbdev patchwork entry, tidy up file patterns.
      fbdev: da8xx: punt duplicated FBIO_WAITFORVSYNC define
      fbdev: sh_mobile_lcdcfb: fix bug in reconfig()
    e5fa5061