From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 16 Jan 2013 21:24:51 +0000 (-0500)
Subject: Merge branch 'stable/for-linus-3.8' into linux-next
X-Git-Tag: next-20130218~34^2~13
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=02638f0193d46686a29e9b6b560c576dd15df2bf;p=karo-tx-linux.git

Merge branch 'stable/for-linus-3.8' into linux-next

* stable/for-linus-3.8:
  xen/grant-table: Force to use v1 of grants.
  xen: Fix stack corruption in xen_failsafe_callback for 32bit PVOPS guests.
  Revert "xen/smp: Fix CPU online/offline bug triggering a BUG: scheduling while atomic."

Conflicts:
	drivers/xen/grant-table.c
---

02638f0193d46686a29e9b6b560c576dd15df2bf