diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:32:01 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:32:01 +0200 |
commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
tree | 547fd497a80818a60ac36831377d5df97868173c /include/asm-sparc64/ioctl.h | |
parent | Merge branch 'linus' into x86/pebs (diff) | |
parent | Linux 2.6.26-rc8 (diff) | |
download | linux-da7878d75b8520c9ae00d27dfbbce546a7bfdfbb.tar.xz linux-da7878d75b8520c9ae00d27dfbbce546a7bfdfbb.zip |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'include/asm-sparc64/ioctl.h')
-rw-r--r-- | include/asm-sparc64/ioctl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc64/ioctl.h b/include/asm-sparc64/ioctl.h index 253d0b57b316..d634c21b4724 100644 --- a/include/asm-sparc64/ioctl.h +++ b/include/asm-sparc64/ioctl.h @@ -1,4 +1,3 @@ -/* $Id: ioctl.h,v 1.2 1998/10/15 05:40:38 jj Exp $ */ #ifndef _SPARC64_IOCTL_H #define _SPARC64_IOCTL_H |