diff --git a/[refs] b/[refs]
index 194a2f9fbb79..9f0bc7cb32cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5c15fc004ac83b7ad280acbe0fd4bbed7e2c8d4
+refs/heads/master: 69c3683ca7fe066ecba9e8a0424c5abd258a5d58
diff --git a/trunk/drivers/net/netconsole.c b/trunk/drivers/net/netconsole.c
index 31e047dd7bb3..501e451be911 100644
--- a/trunk/drivers/net/netconsole.c
+++ b/trunk/drivers/net/netconsole.c
@@ -309,8 +309,8 @@ static ssize_t show_local_mac(struct netconsole_target *nt, char *buf)
 	struct net_device *dev = nt->np.dev;
 
 	DECLARE_MAC_BUF(mac);
-	return snprintf(buf, PAGE_SIZE, "%s\n",
-			print_mac(mac, dev->dev_addr));
+	return snprintf(buf, PAGE_SIZE, "%s\n", dev ?
+			print_mac(mac, dev->dev_addr) : "ff:ff:ff:ff:ff:ff");
 }
 
 static ssize_t show_remote_mac(struct netconsole_target *nt, char *buf)