From: Linus Torvalds Date: Fri, 1 Jul 2011 20:25:56 +0000 (-0700) Subject: Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v3.0-rc6~12 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c9e0b8454582b413bc64c16693c7979417cad3eb;p=linux.git Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * '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. --- c9e0b8454582b413bc64c16693c7979417cad3eb