diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 16:14:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 16:14:58 -0700 |
| commit | e33ab8f275cf6e0e0bf6c9c44149de46222b36cc (patch) | |
| tree | e0f1117cb4295bc99593f4850c9257d22bd37c4a /arch | |
| parent | 3bfccb74973db10a03d3d4c1d10fc00e77145699 (diff) | |
| parent | 7e186bdd0098b34c69fb8067c67340ae610ea499 (diff) | |
| parent | 8c5950881c3b5e6e350e4b0438a8ccc513d90df9 (diff) | |
| parent | 0f16d0dfcdb5aab97d9e368f008b070b5b3ec6d3 (diff) | |
| parent | 7899891c7d161752f29abcc9bc0a9c6c3a3af26c (diff) | |
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()