Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)

1 files changed, 2 insertions, 1 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 0b48e294aafe..a5efc9ae010b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1113,7 +1113,8 @@ out:
 void netdev_rx_csum_fault(struct net_device *dev)
 {
         if (net_ratelimit()) {
-                printk(KERN_ERR "%s: hw csum failure.\n", dev->name);
+                printk(KERN_ERR "%s: hw csum failure.\n", 
+                        dev ? dev->name : "<unknown>");
                 dump_stack();
         }
 }