]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d64dc5 3a6329a)
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)
* 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

1  2 
arch/x86/xen/smp.c patch | diff1 | diff2 | blob | history
drivers/xen/events.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/xen/smp.c
Simple merge
diff --cc drivers/xen/events.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.