Dave Airlie 1fbe6f625f Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next ...

Merge in the upstream tree to bring in the mainline fixes.

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_fbdev.c
	drivers/gpu/drm/nouveau/nouveau_sgdma.c

2011-12-20 14:43:53 +00:00

..

xen-pciback

…

xenbus

xen: map foreign pages for shared rings by updating the PTEs directly

2011-11-16 12:13:08 -05:00

xenfs

…

balloon.c

xen/balloon: Avoid OOM when requesting highmem

2011-11-16 12:13:43 -05:00

biomerge.c

…

cpu_hotplug.c

…

events.c

Merge branch 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2011-11-06 20:13:34 -08:00

evtchn.c

…

features.c

…

gntalloc.c

xen-gntalloc: signedness bug in add_grefs()

2011-11-16 12:13:48 -05:00

gntdev.c

xen-gntdev: integer overflow in gntdev_alloc_map()

2011-11-16 12:13:46 -05:00

grant-table.c

Merge branch 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2011-11-06 20:13:34 -08:00

Kconfig

…

Makefile

…

manage.c

…

pci.c

Merge branch 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2011-11-06 20:13:34 -08:00

platform-pci.c

…

swiotlb-xen.c

Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next

2011-12-20 14:43:53 +00:00

sys-hypervisor.c

…

tmem.c

…

xen-balloon.c

…

xen-selfballoon.c

…

xencomm.c

…