diff options
author | Jiri Kosina <jkosina@suse.cz> | 2008-06-04 04:26:59 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-06-04 04:26:59 -0400 |
commit | f38bb7de289f5c15e287386d35e9c325f1062c49 (patch) | |
tree | 38e69a9ecea18243e3f66bcf51bc89cd7b8f0c94 /include/asm-sparc/mostek.h | |
parent | 2d4b3f37ded8998a362c8d0b4be02f583dd9a002 (diff) | |
parent | c3b25b32e8bef526cca748e1ba023c6bdd705a99 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sparc/mostek.h')
-rw-r--r-- | include/asm-sparc/mostek.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/mostek.h b/include/asm-sparc/mostek.h index 958d0513a6d4..29aad11b8f00 100644 --- a/include/asm-sparc/mostek.h +++ b/include/asm-sparc/mostek.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: mostek.h,v 1.13 2001/01/11 15:07:09 davem Exp $ | 1 | /* |
2 | * mostek.h: Describes the various Mostek time of day clock registers. | 2 | * mostek.h: Describes the various Mostek time of day clock registers. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |