- non_fatal.c comment fix (Zwane Mwaikambo <zwane@linuxpower.ca>)
- s/elevator/io scheduler/ in ll_rw_blk.c (Jens)
- update KJ mailing list address ("Randy.Dunlap" <rddunlap@osdl.org>)
- unused var in riscom8.c (Adrian Bunk <bunk@fs.tum.de>)
MAINTAINERS | 2 +-
arch/i386/kernel/cpu/mcheck/non-fatal.c | 2 +-
drivers/char/riscom8.c | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff -puN arch/i386/kernel/cpu/mcheck/non-fatal.c~misc34 arch/i386/kernel/cpu/mcheck/non-fatal.c
--- 25/arch/i386/kernel/cpu/mcheck/non-fatal.c~misc34 2003-09-01 13:54:39.000000000 -0700
+++ 25-akpm/arch/i386/kernel/cpu/mcheck/non-fatal.c 2003-09-01 13:54:39.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * P4 specific Machine Check Exception Reporting
+ * Non Fatal Machine Check Exception Reporting
*/
#include <linux/init.h>
diff -puN MAINTAINERS~misc34 MAINTAINERS
--- 25/MAINTAINERS~misc34 2003-09-01 13:54:39.000000000 -0700
+++ 25-akpm/MAINTAINERS 2003-09-01 14:07:14.000000000 -0700
@@ -1093,7 +1093,7 @@ S: Maintained
KERNEL JANITORS
P: Several
-L: kernel-janitor-discuss@lists.sf.net
+L: kernel-janitors@osdl.org
W: http://www.kerneljanitors.org/
W: http://sf.net/projects/kernel-janitor/
W: http://developer.osdl.org/rddunlap/kj-patches/
diff -puN drivers/char/riscom8.c~misc34 drivers/char/riscom8.c
--- 25/drivers/char/riscom8.c~misc34 2003-09-01 14:07:19.000000000 -0700
+++ 25-akpm/drivers/char/riscom8.c 2003-09-01 14:07:37.000000000 -0700
@@ -1036,7 +1036,6 @@ static int rc_open(struct tty_struct * t
int error;
struct riscom_port * port;
struct riscom_board * bp;
- unsigned long flags;
board = RC_BOARD(tty->index);
if (board >= RC_NBOARD || !(rc_board[board].flags & RC_BOARD_PRESENT))
_