Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 14:46:48 +0000 (07:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 14:46:48 +0000 (07:46 -0700)
commit115452675361dbef2dfb59f4cbd922637be3dc5b
tree693b1e1f3526d5b4d0881c786726b71934aa3dcc
parent768b56f598694ed7215723d402ca3b388106b042
parented467e69f16e6b480e2face7bc5963834d025f91
Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen

* 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen:
  xen/smp: Warn user why they keel over - nosmp or noapic and what to use instead.
  xen: x86_32: do not enable iterrupts when returning from exception in interrupt context
  xen: use maximum reservation to limit amount of usable RAM
arch/x86/xen/setup.c