Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Jul 2011 20:25:56 +0000 (13:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Jul 2011 20:25:56 +0000 (13:25 -0700)
* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/pci: Use the INT_SRC_OVR IRQ (instead of GSI) to preset the ACPI SCI IRQ.
  xen/mmu: Fix for linker errors when CONFIG_SMP is not defined.


Trivial merge