]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/xen.git/commitdiff
Merge branch 'fsf-address-v1' of git://xenbits.xen.org/people/ianc/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Thu, 30 Jul 2015 14:31:18 +0000 (15:31 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Thu, 30 Jul 2015 14:31:18 +0000 (15:31 +0100)
1  2 
tools/configure
xen/arch/x86/hvm/hvm.c
xen/arch/x86/mm/p2m.c

diff --cc tools/configure
Simple merge
Simple merge
Simple merge