diff options
author | Paul Mackerras | 2008-05-23 08:53:23 +0200 |
---|---|---|
committer | Paul Mackerras | 2008-05-23 08:53:23 +0200 |
commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /include/asm-sparc/shmparam.h | |
parent | [POWERPC] Remove unnecessary cast in arch_deref_entry_point() (diff) | |
parent | [POWERPC] iSeries: Remove unused mail address (diff) | |
download | kernel-qcow2-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.tar.gz kernel-qcow2-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.tar.xz kernel-qcow2-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.zip |
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'include/asm-sparc/shmparam.h')
-rw-r--r-- | include/asm-sparc/shmparam.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc/shmparam.h b/include/asm-sparc/shmparam.h index bb93a6f74a38..59a1243c12f3 100644 --- a/include/asm-sparc/shmparam.h +++ b/include/asm-sparc/shmparam.h @@ -1,4 +1,3 @@ -/* $Id: shmparam.h,v 1.6 1999/12/09 10:32:41 davem Exp $ */ #ifndef _ASMSPARC_SHMPARAM_H #define _ASMSPARC_SHMPARAM_H |