git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream'
[sfrench/cifs-2.6.git]
/
arch
/
x86_64
/
ia32
/
ia32_binfmt.c
diff --git
a/arch/x86_64/ia32/ia32_binfmt.c
b/arch/x86_64/ia32/ia32_binfmt.c
index 572b3b28772ddd7576f713a505a5915d03091b08..e776139afb2019e804d65ddd468a834ee04d6ed1 100644
(file)
--- a/
arch/x86_64/ia32/ia32_binfmt.c
+++ b/
arch/x86_64/ia32/ia32_binfmt.c
@@
-58,7
+58,7
@@
struct elf_phdr;
#define USE_ELF_CORE_DUMP 1
-/* Over
writ
e elfcore.h */
+/* Over
rid
e elfcore.h */
#define _LINUX_ELFCORE_H 1
typedef unsigned int elf_greg_t;