tree 0d39c57cb8c501341ab8ed1d740f076b0b8c0bd0
parent 5d5a8d2d9d6cca979efe4fe1552d787fdc542603
parent c9d6369978411f690513994e6e53e2e6410874a4
author Linus Torvalds <torvalds@linux-foundation.org> 1320633096 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1320633096 -0800

Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  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()