From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 19 Oct 2012 19:30:30 +0000 (-0400)
Subject: Merge branch 'stable/for-linus-3.7' into linux-next
X-Git-Tag: next-20121022~23^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ad502612c173fff239250c9fe9bdfaaef70b9901;p=karo-tx-linux.git

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

* stable/for-linus-3.7:
  xen: dbgp: Fix warning when CONFIG_PCI is not enabled.
  xen: arm: comment on why 64-bit xen_pfn_t is safe even on 32 bit
  xen: balloon: use correct type for frame_list
  xen/x86: don't corrupt %eip when returning from a signal handler
  xen: arm: make p2m operations NOPs
  xen: balloon: don't include e820.h
  xen: grant: use xen_pfn_t type for frame_list.
  xen: events: pirq_check_eoi_map is X86 specific
  xen: XENMEM_translate_gpfn_list was remove ages ago and is unused.
  xen: sysfs: fix build warning.
  xen: sysfs: include err.h for PTR_ERR etc
  xen: xenbus: quirk uses x86 specific cpuid
  xen PV passthru: assign SR-IOV virtual functions to separate virtual slots
  xen/xenbus: Fix compile warning.
  xen/x86: remove duplicated include from enlighten.c
---

ad502612c173fff239250c9fe9bdfaaef70b9901