]> git.baikalelectronics.ru Git - 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)
commite3af28253952d6784819d4df2b431f3162c849a8
tree0d39c57cb8c501341ab8ed1d740f076b0b8c0bd0
parent475e7285b2a5e67778e35c8e4aebff1a0903be90
parentc6a2fc674b6e7947ee58e5f14352c14a0518a343
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