]> www.infradead.org Git - users/jedix/linux-maple.git/commit
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)
commit33430b743dbe944b49ac227bf7eeb0adfe878f9f
treea188460079fd8c000b519fe3027133dc6f18e380
parenta9c920fbed7f1b222068bc15c11ac3fd3d64209f
parent8721f66f644394c2779069e56261be5a6ea09ef9
Merge branch 'stable/for-linus-3.5.rebased' into uek2-merge

* 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.
arch/x86/pci/xen.c
arch/x86/xen/setup.c
drivers/xen/events.c