diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2008-07-03 16:24:06 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-07-03 16:24:06 -0400 |
| commit | e86322f611eef95aafaf726fd3965e5b211f1985 (patch) | |
| tree | 28547e26df4fc6ae671dc8cc6912a53717e4db08 /include/asm-sparc/delay.h | |
| parent | b001a1b6aa960949a24c2cdc28257dfcc9428d74 (diff) | |
| parent | 8948896c9e098c6fd31a6a698a598a7cbd7fa40e (diff) | |
Merge branch 'for-bfields' of git://linux-nfs.org/~tomtucker/xprt-switch-2.6 into for-2.6.27
Diffstat (limited to 'include/asm-sparc/delay.h')
| -rw-r--r-- | include/asm-sparc/delay.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/delay.h b/include/asm-sparc/delay.h index 48aa70eef997..bc9aba2bead6 100644 --- a/include/asm-sparc/delay.h +++ b/include/asm-sparc/delay.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: delay.h,v 1.11 2001/01/01 01:46:15 davem Exp $ | 1 | /* |
| 2 | * delay.h: Linux delay routines on the Sparc. | 2 | * delay.h: Linux delay routines on the Sparc. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu). | 4 | * Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu). |