| commit | eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 10 09:34:40 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 10 09:34:40 2009 -0800 |
| tree | 34f7d08d5f9913c3b5c3bca152953a173ded1e05 | |
| parent | 02412f49f6a7e35753d9af49d92662fb562fc9fa [diff] | |
| parent | df11303c90406426847255ba498607f15a472a0a [diff] |
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.