diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-05 17:56:54 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-05 17:56:54 -0400 |
| commit | c00aafcd4977769e8728292302ddbbb8b1082fab (patch) | |
| tree | 5766bcfbfd7b24816b54298b8ef34054f8cf0fae /arch/mips/dec/time.c | |
| parent | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (diff) | |
| parent | 90bc1a658a53f8832ee799685703977a450e5af9 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/mips/dec/time.c')
| -rw-r--r-- | arch/mips/dec/time.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index 1359c03ded51..463136e6685a 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/mips/dec/time.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds | 2 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds |
| 5 | * Copyright (C) 2000, 2003 Maciej W. Rozycki | 3 | * Copyright (C) 2000, 2003 Maciej W. Rozycki |
| 6 | * | 4 | * |