Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jul 2011 20:19:04 +0000 (13:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jul 2011 20:19:04 +0000 (13:19 -0700)
commit075d9db13183c102770dc6cefabfee1b832f9614
tree2fdde9bd3d0f3853dbed9b7ce945d761b530fe25
parente55f1b1c00a2df492fbdaeb3fcba67a45bc82a0e
parentee339fe63ac408e4604c1c88b1f9a428f2511b70
Merge branch 'stable/bug.fixes' of git://git./linux/kernel/git/konrad/xen

* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/pci: Move check for acpi_sci_override_gsi to xen_setup_acpi_sci.