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
..
boot	x86: support XZ-compressed kernel	2011-01-13 08:03:25 -08:00
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2011-01-13 10:25:58 -08:00
ia32	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
include/asm	Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-13 18:46:48 -08:00
kernel	thp: split_huge_page_mm/vma	2011-01-13 17:32:41 -08:00
kvm	thp: mmu_notifier_test_young	2011-01-13 17:32:46 -08:00
lguest	x86, mm: Initialize initial_page_table before paravirt jumps	2011-01-04 09:53:50 +01:00
lib	x86: udelay: Use this_cpu_read to avoid address calculation	2011-01-04 06:08:55 +01:00
math-emu	x86, fpu: Unbreak FPU emulation	2010-05-10 13:37:16 -07:00
mm	thp: mmu_notifier_test_young	2011-01-13 17:32:46 -08:00
oprofile	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-11 11:02:13 -08:00
pci	x86: Use PCI method for enabling AMD extended config space before MSR method	2011-01-11 12:43:41 +01:00
platform	Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-13 10:15:12 -08:00
power	x86, tsc, sched: Recompute cyc2ns_offset's during resume from sleep states	2010-08-20 14:59:02 +02:00
tools
vdso	x86, gcc-4.6: Use gcc -m options when building vdso	2010-12-13 16:08:37 -08:00
video
xen	Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-13 18:46:48 -08:00
.gitignore	add random binaries to .gitignore	2010-04-08 11:34:34 +02:00
Kbuild	x86: Add platform directory	2010-10-27 14:30:01 +02:00
Kconfig	Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-13 10:15:12 -08:00
Kconfig.cpu	x86: this_cpu_cmpxchg and this_cpu_xchg operations	2010-12-18 15:54:04 +01:00
Kconfig.debug	x86: Add RO/NX protection for loadable kernel modules	2010-11-18 13:32:56 +01:00
Makefile	Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-10-21 13:06:00 -07:00
Makefile_32.cpu	jump label: Add work around to i386 gcc asm goto bug	2010-10-29 14:45:29 -04:00