| commit | c9e0b8454582b413bc64c16693c7979417cad3eb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 01 13:25:56 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 01 13:25:56 2011 -0700 |
| tree | dfa94b9445aaa854f8e8767d60f395c2de59a29c | |
| parent | 0466dcbeda72e6a2753cd7e81f0a190054bd2233 [diff] | |
| parent | 155a16f21923bc2f04161ac92acca986371ef27b [diff] |
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.