]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/vmalloc-3.2.rebased' into stable/for-linus-3.3.rebased
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 2 Feb 2012 19:12:34 +0000 (14:12 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 2 Feb 2012 19:12:34 +0000 (14:12 -0500)
commitf072a83f292016a99b19da18f4d6d755f6f6ef06
tree8ba2535f3344e410a162f7374c2ee8d37ad822a2
parent5b8a96e0d89fd8183f7f1a8c283b812f3bc99b5a
parent2747e3d0a5687430dfd6a2628dbba1327b567096
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()
arch/x86/xen/grant-table.c
include/xen/grant_table.h