Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Sep 2011 18:28:11 +0000 (11:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Sep 2011 18:28:11 +0000 (11:28 -0700)
* 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen:
  xen/i386: follow-up to "replace order-based range checking of M2P table by linear one"
  xen/irq: Alter the locking to use a mutex instead of a spinlock.
  xen/e820: if there is no dom0_mem=, don't tweak extra_pages.
  xen: disable PV spinlocks on HVM

1  2 
arch/x86/xen/mmu.c
arch/x86/xen/setup.c

Simple merge
Simple merge