diff options
| author | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2012-03-14 11:03:37 +0000 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2012-03-14 11:03:37 +0000 |
| commit | c8d4c39fe9d19d473d2a59869889198e48941c07 (patch) | |
| tree | a137a9d1a255dba53114839ee1cc4b399b14ec51 | |
| parent | 162bf2c2b1aa8d6b3fadb7190d875cf1fa84afa2 (diff) | |
| parent | 0269356e88848349201b262375fbf8120db5cb52 (diff) | |
| download | xen-c8d4c39fe9d19d473d2a59869889198e48941c07.tar.gz xen-c8d4c39fe9d19d473d2a59869889198e48941c07.tar.bz2 xen-c8d4c39fe9d19d473d2a59869889198e48941c07.zip | |
Merge
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .hgignore | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8c80ceabb3..2782ee591c 100644 --- a/.gitignore +++ b/.gitignore @@ -289,6 +289,8 @@ tools/ocaml-xenstored* 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 @@ -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$ |