From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 May 2013 21:01:18 +0000 (+0900)
Subject: Merge tag 'stable/for-linus-3.10-rc3-tag' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v4.0~3969
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3655b22de04e3635fe3a2d7b9529cb12609a9bd0;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'stable/for-linus-3.10-rc3-tag' of git://git./linux/kernel/git/konrad/xen

Pull Xen fixes from Konrad Rzeszutek Wilk:
 - Use proper error paths
 - Clean up APIC IPI usage (incorrect arguments)
 - Delay XenBus frontend resume is backend (xenstored) is not running
 - Fix build error with various combinations of CONFIG_

* tag 'stable/for-linus-3.10-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xenbus_client.c: correct exit path for xenbus_map_ring_valloc_hvm
  xen-pciback: more uses of cached MSI-X capability offset
  xen: Clean up apic ipi interface
  xenbus: save xenstore local status for later use
  xenbus: delay xenbus frontend resume if xenstored is not running
  xmem/tmem: fix 'undefined variable' build error.
---

3655b22de04e3635fe3a2d7b9529cb12609a9bd0