From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Dec 2009 17:34:40 +0000 (-0800)
Subject: Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
X-Git-Tag: v2.6.33-rc1~328
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5

Merge branch 'xen/fbdev' of git://git./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.
---

eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5