diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-16 02:56:07 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-16 02:56:07 +0100 |
| commit | 77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db (patch) | |
| tree | 805db8c5c180ee7ee85b3c484461100c91f6c781 /include/asm-ppc/mpc85xx.h | |
| parent | Merge branch 'upstream-fixes' (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db.tar.xz linux-77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db.zip | |
Merge branch 'master'
Diffstat (limited to 'include/asm-ppc/mpc85xx.h')
| -rw-r--r-- | include/asm-ppc/mpc85xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/mpc85xx.h b/include/asm-ppc/mpc85xx.h index d98db980cd49..9d14baea3d71 100644 --- a/include/asm-ppc/mpc85xx.h +++ b/include/asm-ppc/mpc85xx.h @@ -3,7 +3,7 @@ * * MPC85xx definitions * - * Maintainer: Kumar Gala <kumar.gala@freescale.com> + * Maintainer: Kumar Gala <galak@kernel.crashing.org> * * Copyright 2004 Freescale Semiconductor, Inc * |