kernel-fxtec-pro1x/arch
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
..
alpha thp: mm: define MADV_NOHUGEPAGE 2011-01-13 17:32:47 -08:00
arm thp: pte alloc trans splitting 2011-01-13 17:32:40 -08:00
avr32 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6 2011-01-13 12:06:58 -08:00
blackfin Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
cris Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
frv
h8300
ia64 thp: pte alloc trans splitting 2011-01-13 17:32:40 -08:00
m32r
m68k Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 2011-01-13 10:24:52 -08:00
m68knommu m68knommu: Need to check __get_user()/__put_user() result 2011-01-07 14:07:00 +01:00
microblaze Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 2011-01-11 11:13:46 -08:00
mips thp: mm: define MADV_NOHUGEPAGE 2011-01-13 17:32:47 -08:00
mn10300 kernel: clean up USE_GENERIC_SMP_HELPERS 2011-01-13 08:03:08 -08:00
parisc thp: mm: define MADV_NOHUGEPAGE 2011-01-13 17:32:47 -08:00
powerpc thp: alter compound get_page/put_page 2011-01-13 17:32:39 -08:00
s390 Merge branch 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm 2011-01-13 10:14:24 -08:00
score
sh thp: pte alloc trans splitting 2011-01-13 17:32:40 -08:00
sparc thp: pte alloc trans splitting 2011-01-13 17:32:40 -08:00
tile
um thp: pte alloc trans splitting 2011-01-13 17:32:40 -08:00
x86 Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen 2011-01-13 18:46:48 -08:00
xtensa thp: mm: define MADV_NOHUGEPAGE 2011-01-13 17:32:47 -08:00
.gitignore
Kconfig [S390] mutex: Introduce arch_mutex_cpu_relax() 2011-01-05 12:47:31 +01:00