]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2011 02:31:36 +0000 (18:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2011 02:31:36 +0000 (18:31 -0800)
commit06d381484fe8fb1ba2996c22e89595a273e3634c
tree0d39c57cb8c501341ab8ed1d740f076b0b8c0bd0
parent5d5a8d2d9d6cca979efe4fe1552d787fdc542603
parentc9d6369978411f690513994e6e53e2e6410874a4
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()
drivers/block/xen-blkback/common.h
drivers/block/xen-blkback/xenbus.c
drivers/net/xen-netback/netback.c
include/xen/grant_table.h