Merge branch 'stable/vmalloc-3.2.rebased' into stable/for-linus-3.3.rebased

* stable/vmalloc-3.2.rebased:
  xen: map foreign pages for shared rings by updating the PTEs directly
  net: xen-netback: use API provided by xenbus module to map rings
  block: xen-blkback: use API provided by xenbus module to map rings
  xen: use generic functions instead of xen_{alloc, free}_vm_area()

diff --cc arch/x86/xen/grant-table.c
Simple merge

diff --cc include/xen/grant_table.h
Simple merge