Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
commit4762e252f4afc6909edb0babe9c25f126afedcaa
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Aug 2011 18:25:44 +0000 (22 11:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Aug 2011 18:25:44 +0000 (22 11:25 -0700)
treef4d68be15b2c5887f98894996899e9e3f191ce4c
parent3210d190dcb717c328d74f8c3f69ec717d665b40
parent60c5f08e154fd235056645e050f2cd5671b19125
Merge branch 'stable/bug.fixes' of git://git./linux/kernel/git/konrad/xen

* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/tracing: Fix tracing config option properly
  xen: Do not enable PV IPIs when vector callback not present
  xen/x86: replace order-based range checking of M2P table by linear one
  xen: xen-selfballoon.c needs more header files
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c