projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62fe12e 443701e)
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 patch | diff1 | diff2 | blob | history
xen/arch/x86/hvm/hvm.c patch | diff1 | diff2 | blob | history
xen/arch/x86/mm/p2m.c patch | diff1 | diff2 | blob | history

diff --cc tools/configure
Simple merge
diff --cc xen/arch/x86/hvm/hvm.c
Simple merge
diff --cc xen/arch/x86/mm/p2m.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.