diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-05-12 22:29:14 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-05-12 22:29:14 +0200 |
commit | 5aaca7a7a5db157530d195c4b93c8fc4682f8a48 (patch) | |
tree | 1c9a2a7e898c8a460bc10d7f3c5c8308188c0072 /arch/mips/au1000/common/Makefile | |
parent | 8c6b0ef2ea1bb42cd72d987389297f66cd25790b (diff) | |
parent | 9404ef02974a5411687b6c1b8ef3984305620e02 (diff) | |
download | op-kernel-dev-5aaca7a7a5db157530d195c4b93c8fc4682f8a48.zip op-kernel-dev-5aaca7a7a5db157530d195c4b93c8fc4682f8a48.tar.gz |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/mips/au1000/common/Makefile')
-rw-r--r-- | arch/mips/au1000/common/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/au1000/common/Makefile b/arch/mips/au1000/common/Makefile index 90e2d7a..dd0e19d 100644 --- a/arch/mips/au1000/common/Makefile +++ b/arch/mips/au1000/common/Makefile @@ -1,9 +1,8 @@ # -# Copyright 2000 MontaVista Software Inc. -# Author: MontaVista Software, Inc. -# ppopov@mvista.com or source@mvista.com +# Copyright 2000, 2008 MontaVista Software Inc. +# Author: MontaVista Software, Inc. <source@mvista.com> # -# Makefile for the Alchemy Au1000 CPU, generic files. +# Makefile for the Alchemy Au1xx0 CPUs, generic files. # obj-y += prom.o irq.o puts.o time.o reset.o \ |