---

yaml --- r: 324444 b: refs/heads/master c: c2c5a70 h: refs/heads/master v: v3
git-mirror · Sep 17, 2012 · 42bc31c · 42bc31c
1 parent e5baae1
commit 42bc31c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b004ff4972e2a42aa4512c90cc6a9e4dc1bb36b6
+refs/heads/master: c2c5a7051c556036b7beb8f4a89eefdc91c3245b
diff --git a/trunk/lib/dynamic_debug.c b/trunk/lib/dynamic_debug.c
@@ -634,7 +634,7 @@ int __dynamic_netdev_dbg(struct _ddebug *descriptor,
 					       dict, sizeof(dict));
 
 		res = printk_emit(0, 7, dictlen ? dict : NULL, dictlen,
-				  "%s%s %s: %s: %pV",
+				  "%s%s %s %s: %pV",
 				  dynamic_emit_prefix(descriptor, buf),
 				  dev_driver_string(dev->dev.parent),
 				  dev_name(dev->dev.parent),

diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -6435,7 +6435,7 @@ static int __netdev_printk(const char *level, const struct net_device *dev,
 
 		r = printk_emit(0, level[1] - '0',
 				dictlen ? dict : NULL, dictlen,
-				"%s %s: %s: %pV",
+				"%s %s %s: %pV",
 				dev_driver_string(dev->dev.parent),
 				dev_name(dev->dev.parent),
 				netdev_name(dev), vaf);