diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 04:17:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 04:17:15 -0400 |
| commit | 28638ea4f8adb63f837e4436560ab16ab0388587 (patch) | |
| tree | 2dab7a03d7696697c82ba62a03700d3a2f3639b1 /include/asm-sparc64/ide.h | |
| parent | f781b03c4b1c713ac000877c8bbc31fc4164a29b (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/nmi
Conflicts:
arch/x86/kernel/nmi_32.c
Diffstat (limited to 'include/asm-sparc64/ide.h')
| -rw-r--r-- | include/asm-sparc64/ide.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h index c5fdabe0b42d..1282676da1cd 100644 --- a/include/asm-sparc64/ide.h +++ b/include/asm-sparc64/ide.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: ide.h,v 1.21 2001/09/25 20:21:48 kanoj Exp $ | 1 | /* |
| 2 | * ide.h: Ultra/PCI specific IDE glue. | 2 | * ide.h: Ultra/PCI specific IDE glue. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |