From 9d1e44738afdc0bb3609fd97367ee216fdb6b9f0 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Wed, 1 Feb 2006 03:06:23 -0800 Subject: [PATCH] --- yaml --- r: 19427 b: refs/heads/master c: db805812084ab03fbf6aac95c5f7ef2f50e3bd9a h: refs/heads/master i: 19425: 14cd16b8a821696f8c1edafcf8be849f9783db25 19423: ebcb45e1c0d9258ca5901459c7d8d7e3cec29b26 v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/mcast_kern.c | 2 +- trunk/arch/um/drivers/mconsole_kern.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 110b945d63b4..0b4a7cb660c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6b7a1edcb31306f904b5b11354bf0d198136e15 +refs/heads/master: db805812084ab03fbf6aac95c5f7ef2f50e3bd9a diff --git a/trunk/arch/um/drivers/mcast_kern.c b/trunk/arch/um/drivers/mcast_kern.c index 217438cdef33..db5322b176e1 100644 --- a/trunk/arch/um/drivers/mcast_kern.c +++ b/trunk/arch/um/drivers/mcast_kern.c @@ -40,7 +40,7 @@ void mcast_init(struct net_device *dev, void *data) dpri->dev = dev; printk("mcast backend "); - printk("multicast adddress: %s:%u, TTL:%u ", + printk("multicast address: %s:%u, TTL:%u ", dpri->addr, dpri->port, dpri->ttl); printk("\n"); diff --git a/trunk/arch/um/drivers/mconsole_kern.c b/trunk/arch/um/drivers/mconsole_kern.c index e3d576567172..c9903a6345d7 100644 --- a/trunk/arch/um/drivers/mconsole_kern.c +++ b/trunk/arch/um/drivers/mconsole_kern.c @@ -273,7 +273,7 @@ void mconsole_proc(struct mc_request *req) config - Query the configuration of a device \n\ remove - Remove a device from UML \n\ sysrq - Performs the SysRq action controlled by the letter \n\ - cad - invoke the Ctl-Alt-Del handler \n\ + cad - invoke the Ctrl-Alt-Del handler \n\ stop - pause the UML; it will do nothing until it receives a 'go' \n\ go - continue the UML after a 'stop' \n\ log - make UML enter into the kernel log\n\