]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-linus-3.4' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 27 Apr 2012 20:07:15 +0000 (16:07 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 27 Apr 2012 20:07:15 +0000 (16:07 -0400)
* stable/for-linus-3.4:
  xen: correctly check for pending events when restoring irq flags
  xen/acpi: Workaround broken BIOSes exporting non-existing C-states.
  xen/smp: Fix crash when booting with ACPI hotplug CPUs.
  xen: use the pirq number to check the pirq_eoi_map
  xen/enlighten: Disable MWAIT_LEAF so that acpi-pad won't be loaded.


Trivial merge