]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'stable/irq', 'stable/p2m.bugfixes', 'stable/e820.bugfixes' and 'stabl...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 May 2011 23:14:58 +0000 (16:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 May 2011 23:14:58 +0000 (16:14 -0700)
commitfdaad25397a416a1d4333198a5e00104168cac15
treee0f1117cb4295bc99593f4850c9257d22bd37c4a
parent531bd2545797f6c1d11b421b4d57247f6a75a6cc
parent4156ac4a6430b4eea547d0c028c9af1225c2c89a
parent744e6f712068e8e807c47b5cfe6491a1de8858d9
parentf52e83e3a567d3f19db7b4e693d62f8e099f0906
parentc0e1a2b5932ef5d40789b557c382dc34b41cf87f
Merge branches 'stable/irq', 'stable/p2m.bugfixes', 'stable/e820.bugfixes' and 'stable/mmu.bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/irq' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: do not clear and mask evtchns in __xen_evtchn_do_upcall

* 'stable/p2m.bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/p2m: Create entries in the P2M_MFN trees's to track 1-1 mappings

* 'stable/e820.bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/setup: Fix for incorrect xen_extra_mem_start initialization under 32-bit
  xen/setup: Ignore E820_UNUSABLE when setting 1-1 mappings.

* 'stable/mmu.bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen mmu: fix a race window causing leave_mm BUG()
arch/x86/xen/mmu.c
arch/x86/xen/p2m.c
arch/x86/xen/setup.c
drivers/xen/events.c