summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 09:17:47 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 09:17:47 +0200
commit31018acd4c77f0e4b90f870011249f32c5e3d5b6 (patch)
treea588fb41ac2b37a5de7112732d861cb328840d5a /arch/x86/pci
parent5eef150c1d7e41baaefd00dd56c153debcd86aee (diff)
parenta491dbef56f2aba42fb292067d4652d246627738 (diff)
parent38a1ed4f039db32b418007ac365076cf53647ebd (diff)
downloadlinux-31018acd4c77f0e4b90f870011249f32c5e3d5b6.tar.bz2
Merge branches 'stable/bug.fixes-3.2' and 'stable/mmu.fixes' of git://git.kernel.org/pub/scm/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."