From: Konrad Rzeszutek Wilk Date: Mon, 21 May 2012 21:48:15 +0000 (-0400) Subject: Merge branch 'stable/for-linus-3.5.rebased' into uek2-merge X-Git-Tag: v2.6.39-400.9.0~543^2~4 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=33430b743dbe944b49ac227bf7eeb0adfe878f9f;p=users%2Fjedix%2Flinux-maple.git 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. --- 33430b743dbe944b49ac227bf7eeb0adfe878f9f