Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] iSeries: Remove unused mail address [POWERPC] mpic: Fix use of uninitialized variable [POWERPC] Add kernstart_addr to list of allowed symbols in prom_init [POWERPC] Fix __set_fixmap() for STRICT_MM_TYPECHECKS [POWERPC] PS3: Fix memory hotplug
2026-10-24 13:44:26 -04:00 · 2008-05-23 08:15:12 -07:00 · 2008-05-23 08:15:12 -07:00 · cbff290491
commit cbff290491
parent 6483d152ac 8962cadbe7
9 changed files with 13 additions and 25 deletions
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@ -3,7 +3,7 @@
 *  Authors: Dave Boutcher <boutcher@us.ibm.com>
 *           Ryan Arnold <ryanarn@us.ibm.com>
 *           Colin Devilbiss <devilbis@us.ibm.com>
- *           Stephen Rothwell <sfr@au1.ibm.com>
+ *           Stephen Rothwell
 *
 * (C) Copyright 2000-2004 IBM Corporation
 *
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@ -6,7 +6,7 @@
 *  Authors: Dave Boutcher <boutcher@us.ibm.com>
 *           Ryan Arnold <ryanarn@us.ibm.com>
 *           Colin Devilbiss <devilbis@us.ibm.com>
- *           Stephen Rothwell <sfr@au1.ibm.com>
+ *           Stephen Rothwell
 *
 * (C) Copyright 2000-2004 IBM Corporation
 *
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@ -7,7 +7,7 @@
 *  Authors: Dave Boutcher <boutcher@us.ibm.com>
 *           Ryan Arnold <ryanarn@us.ibm.com>
 *           Colin Devilbiss <devilbis@us.ibm.com>
- *           Stephen Rothwell <sfr@au1.ibm.com>
+ *           Stephen Rothwell
 *
 * (C) Copyright 2000, 2001, 2002, 2003, 2004 IBM Corporation
 *
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@ -6,7 +6,7 @@
 *  Authors: Dave Boutcher <boutcher@us.ibm.com>
 *           Ryan Arnold <ryanarn@us.ibm.com>
 *           Colin Devilbiss <devilbis@us.ibm.com>
- *           Stephen Rothwell <sfr@au1.ibm.com>
+ *           Stephen Rothwell
 *
 * (C) Copyright 2000-2004 IBM Corporation
 *