diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-12 16:08:14 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-09-12 16:08:14 -0700 |
| commit | f801cf55bebc8d0d397fbe6db8cc91b3afb78149 (patch) | |
| tree | a45eaf32f0a057f7e4b3fb7db2333d9c84491b0c /libc/kernel/arch-mips/asm/mman.h | |
| parent | ccd7ee624a81d61675fa08e149fe190a317341eb (diff) | |
| parent | 47bda0c293c167f12ddde6e66192ad581c4a67e1 (diff) | |
| download | bionic-f801cf55bebc8d0d397fbe6db8cc91b3afb78149.zip bionic-f801cf55bebc8d0d397fbe6db8cc91b3afb78149.tar.gz bionic-f801cf55bebc8d0d397fbe6db8cc91b3afb78149.tar.bz2 | |
resolved conflicts for merge of 47bda0c2 to jb-mr1-dev
Change-Id: Ia1969c79111c006bde709920254a515646c20aa7
Diffstat (limited to 'libc/kernel/arch-mips/asm/mman.h')
| -rw-r--r-- | libc/kernel/arch-mips/asm/mman.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libc/kernel/arch-mips/asm/mman.h b/libc/kernel/arch-mips/asm/mman.h index c5b93a4..cb42c6a 100644 --- a/libc/kernel/arch-mips/asm/mman.h +++ b/libc/kernel/arch-mips/asm/mman.h @@ -77,4 +77,3 @@ #define MAP_FILE 0 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif - |