summaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog/booke_wdt.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-15 20:56:07 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-15 20:56:07 -0500
commit77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db (patch)
tree805db8c5c180ee7ee85b3c484461100c91f6c781 /drivers/char/watchdog/booke_wdt.c
parent68bdbdf0b32566e1ebd41415bde9a7c43b47bf48 (diff)
parentf6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (diff)
downloadblackbird-op-linux-77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db.tar.gz
blackbird-op-linux-77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db.zip
Merge branch 'master'
Diffstat (limited to 'drivers/char/watchdog/booke_wdt.c')
-rw-r--r--drivers/char/watchdog/booke_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c
index abc30cca6645..65830ec71042 100644
--- a/drivers/char/watchdog/booke_wdt.c
+++ b/drivers/char/watchdog/booke_wdt.c
@@ -4,7 +4,7 @@
* Watchdog timer for PowerPC Book-E systems
*
* Author: Matthew McClintock
- * Maintainer: Kumar Gala <kumar.gala@freescale.com>
+ * Maintainer: Kumar Gala <galak@kernel.crashing.org>
*
* Copyright 2005 Freescale Semiconductor Inc.
*
OpenPOWER on IntegriCloud