Linus Torvalds 9c4bc1c2be Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen ... * 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/p2m: Fix module linking error. xen p2m: clear the old pte when adding a page to m2p_override xen gntdev: use gnttab_map_refs and gnttab_unmap_refs xen: introduce gnttab_map_refs and gnttab_unmap_refs xen p2m: transparently change the p2m mappings in the m2p override xen/gntdev: Fix circular locking dependency xen/gntdev: stop using "token" argument xen: gntdev: move use of GNTMAP_contains_pte next to the map_op xen: add m2p override mechanism xen: move p2m handling to separate file xen/gntdev: add VM_PFNMAP to vma xen/gntdev: allow usermode to map granted pages xen: define gnttab_set_map_op/unmap_op Fix up trivial conflict in drivers/xen/Kconfig		2011-01-13 18:46:48 -08:00
..
xenbus	xen/xenbus: fixup checkpatch issues in xenbus_probe*	2011-01-05 16:31:08 -05:00
xenfs	Merge branch 'upstream/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen	2010-11-24 08:23:18 +09:00
balloon.c	xen: prevent crashes with non-HIGHMEM 32-bit kernels with largeish memory	2010-12-02 15:30:06 -08:00
biomerge.c
cpu_hotplug.c
events.c	Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-10 08:48:46 -08:00
evtchn.c
features.c
gntdev.c	xen gntdev: use gnttab_map_refs and gnttab_unmap_refs	2011-01-11 14:32:06 -05:00
grant-table.c	xen p2m: clear the old pte when adding a page to m2p_override	2011-01-11 14:32:14 -05:00
Kconfig	Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-13 18:46:48 -08:00
Makefile	Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-13 18:46:48 -08:00
manage.c	xen: resume the pv console for hvm guests too	2010-12-02 14:40:48 +00:00
pci.c
platform-pci.c	xen-platform: use PCI interfaces to request IO and MEM resources.	2011-01-12 10:28:01 -05:00
swiotlb-xen.c
sys-hypervisor.c
xencomm.c