]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/for-linus-3.4.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 30 Apr 2012 15:17:56 +0000 (11:17 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 30 Apr 2012 15:17:56 +0000 (11:17 -0400)
commitbd7c9511fb9b9232bf3ce745cb1a9a000e15b85b
treeafcf60362676a16c74eec85c8e3f20490034adfd
parent9d64dc52baddb2d70f6a4541fe1bb1590e6c860b
parent3a6329ac0d0de0c80cb7d8030de71b5f145f129e
Merge branch 'stable/for-linus-3.4.rebased' into uek2-merge

* stable/for-linus-3.4.rebased:
  drivers/video/xen-fbfront.c: add missing cleanup code
  xen: correctly check for pending events when restoring irq flags
  xen/smp: Fix crash when booting with ACPI hotplug CPUs.
  xen: use the pirq number to check the pirq_eoi_map
arch/x86/xen/smp.c
drivers/xen/events.c