From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Oct 2011 07:17:47 +0000 (+0200)
Subject: Merge branches 'stable/bug.fixes-3.2' and 'stable/mmu.fixes' of git://git.kernel... 
X-Git-Tag: v3.2-rc1~193
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31018acd4c77f0e4b90f870011249f32c5e3d5b6;p=pandora-kernel.git

Merge branches 'stable/bug.fixes-3.2' and 'stable/mmu.fixes' of git://git./linux/kernel/git/konrad/xen

* 'stable/bug.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/p2m/debugfs: Make type_name more obvious.
  xen/p2m/debugfs: Fix potential pointer exception.
  xen/enlighten: Fix compile warnings and set cx to known value.
  xen/xenbus: Remove the unnecessary check.
  xen/irq: If we fail during msi_capability_init return proper error code.
  xen/events: Don't check the info for NULL as it is already done.
  xen/events: BUG() when we can't allocate our event->irq array.

* 'stable/mmu.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: Fix selfballooning and ensure it doesn't go too far
  xen/gntdev: Fix sleep-inside-spinlock
  xen: modify kernel mappings corresponding to granted pages
  xen: add an "highmem" parameter to alloc_xenballooned_pages
  xen/p2m: Use SetPagePrivate and its friends for M2P overrides.
  xen/p2m: Make debug/xen/mmu/p2m visible again.
  Revert "xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set."
---

31018acd4c77f0e4b90f870011249f32c5e3d5b6
Reading git-diff-tree failed