From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 30 Apr 2012 15:17:56 +0000 (-0400)
Subject: Merge branch 'stable/for-linus-3.4.rebased' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~543^2~13
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bd7c9511fb9b9232bf3ce745cb1a9a000e15b85b;p=users%2Fjedix%2Flinux-maple.git

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
---

bd7c9511fb9b9232bf3ce745cb1a9a000e15b85b