diff --git a/[refs] b/[refs] index 184c5f05ad92..951f366976c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f0b6702b5d0c10b8a1637f05baf0d597c9c0cc1 +refs/heads/master: b9d6d2dbf45b038a94c63295203525101a9fbbb7 diff --git a/trunk/drivers/net/bonding/bond_3ad.c b/trunk/drivers/net/bonding/bond_3ad.c index 0ae0d7c54ccf..793b00138275 100644 --- a/trunk/drivers/net/bonding/bond_3ad.c +++ b/trunk/drivers/net/bonding/bond_3ad.c @@ -660,7 +660,7 @@ static void __attach_bond_to_agg(struct port *port) static void __detach_bond_from_agg(struct port *port) { port = NULL; /* just to satisfy the compiler */ - // This function does nothing sience the parser/multiplexer of the receive + // This function does nothing since the parser/multiplexer of the receive // and the parser/multiplexer of the aggregator are already combined }