]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/pvh.v7' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 25 Jan 2013 21:25:16 +0000 (16:25 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 25 Jan 2013 21:25:16 +0000 (16:25 -0500)
* stable/pvh.v7:
  xen/pvh: specify xen features strings cleanly for PVH
  xen: implement updated XENMEM_add_to_physmap_range ABI

1  2 
arch/arm/xen/enlighten.c
arch/x86/xen/mmu.c

Simple merge
Simple merge