Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
index 3dc1cbf849db..b785e936244f 100644
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
@@ -957,7 +957,7 @@ static void set_broadcast_channel(struct fw_device *device, int generation)
                                 device->bc_implemented = BC_IMPLEMENTED;
                                 break;
                         }
-                        /* else fall through to case address error */
+                        /* else, fall through - to case address error */
                 case RCODE_ADDRESS_ERROR:
                         device->bc_implemented = BC_UNIMPLEMENTED;
                 }