]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4d9e222665a047bfd75d8ebfa7c7886f5f2ed422
tree34f7d08d5f9913c3b5c3bca152953a173ded1e05
parent4dfb5c9608d65ee31bed47cea1b1e6dd97a40b58
parent43f997ab040601c42d7e8626dea9cef771230da6
Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

* '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.
drivers/input/Kconfig
drivers/video/Kconfig
drivers/video/fb_defio.c
include/linux/fb.h