]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Dec 2009 17:34:40 +0000 (09:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Dec 2009 17:34:40 +0000 (09:34 -0800)
* 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen pvfb: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
  fb-defio: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
  fb-defio: If FBINFO_VIRTFB is defined, do not set VM_IO flag.
  Fix toogle whether xenbus driver should be built as module or part of kernel.

1  2 
drivers/input/Kconfig
drivers/video/Kconfig
drivers/video/fb_defio.c
include/linux/fb.h

Simple merge
Simple merge
Simple merge
Simple merge