[Xen-changelog] [xen-unstable] Merge

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1331723017 0
# Node ID d7e4b0725e978368253ab2ae42a0d13b3ab8d9f1
# Parent  21376d9d27df8c50d56d7f8111a5e8136f569f2d
# Parent  e0704f25593110469d08346e85804ae89ecd909e
Merge
---


diff -r 21376d9d27df -r d7e4b0725e97 .gitignore
--- a/.gitignore        Wed Mar 14 11:03:13 2012 +0000
+++ b/.gitignore        Wed Mar 14 11:03:37 2012 +0000
@@ -289,6 +289,8 @@
 xen/.banner*
 xen/BLOG
 xen/System.map
+xen/arch/arm/asm-offsets.s
+xen/arch/arm/xen.lds
 xen/arch/x86/asm-offsets.s
 xen/arch/x86/boot/mkelf32
 xen/arch/x86/xen.lds
diff -r 21376d9d27df -r d7e4b0725e97 .hgignore
--- a/.hgignore Wed Mar 14 11:03:13 2012 +0000
+++ b/.hgignore Wed Mar 14 11:03:37 2012 +0000
@@ -314,6 +314,8 @@
 ^xen/\.banner.*$
 ^xen/BLOG$
 ^xen/System.map$
+^xen/arch/arm/asm-offsets\.s$
+^xen/arch/arm/xen\.lds$
 ^xen/arch/x86/asm-offsets\.s$
 ^xen/arch/x86/boot/mkelf32$
 ^xen/arch/x86/xen\.lds$

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog