diff options
author | 2009-08-15 13:00:02 +0900 | |
---|---|---|
committer | 2009-08-15 13:00:02 +0900 | |
commit | 4b6b987969b076298485697bfb0d0e35502642a3 (patch) | |
tree | a8f5ebd6a0b9efbe30272012d759669b0c5ddc13 /arch/mips/kernel/proc.c | |
parent | sh: Runtime PM pdev hwblk - Solution Engine 7724 (diff) | |
parent | Merge branch 'sh/stable-updates' (diff) | |
download | linux-dev-4b6b987969b076298485697bfb0d0e35502642a3.tar.xz linux-dev-4b6b987969b076298485697bfb0d0e35502642a3.zip |
Merge branch 'master' into sh/hwblk
Diffstat (limited to 'arch/mips/kernel/proc.c')
-rw-r--r-- | arch/mips/kernel/proc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index e0a4ac18fa07..26109c4d5170 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c @@ -1,6 +1,4 @@ /* - * linux/arch/mips/kernel/proc.c - * * Copyright (C) 1995, 1996, 2001 Ralf Baechle * Copyright (C) 2001, 2004 MIPS Technologies, Inc. * Copyright (C) 2004 Maciej W. Rozycki |