]> 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: a9c920f 8721f66)
Merge branch 'stable/for-linus-3.5.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 21 May 2012 21:48:15 +0000 (17:48 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 21 May 2012 21:48:15 +0000 (17:48 -0400)
* stable/for-linus-3.5.rebased:
  hvc_xen: NULL dereference on allocation failure
  xen: do not map the same GSI twice in PVHVM guests.
  xen/setup: Work properly with 'dom0_mem=X' or with not dom0_mem.

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

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