diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-21 02:47:07 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-21 02:47:07 +0200 |
| commit | 828d7d7b19446bf5a40928da47955c575a454c75 (patch) | |
| tree | fd006445c562749de9a07fe6e5363bab5d285a20 /drivers/net/bonding/bond_alb.h | |
| parent | Bluetooth: Fix lockdep warning in L2CAP (diff) | |
| parent | iwl4965: fix skb usage after free (diff) | |
| download | linux-828d7d7b19446bf5a40928da47955c575a454c75.tar.xz linux-828d7d7b19446bf5a40928da47955c575a454c75.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Conflicts:
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
Diffstat (limited to 'drivers/net/bonding/bond_alb.h')
| -rw-r--r-- | drivers/net/bonding/bond_alb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_alb.h b/drivers/net/bonding/bond_alb.h index 118c28aa471e..4b3e35878406 100644 --- a/drivers/net/bonding/bond_alb.h +++ b/drivers/net/bonding/bond_alb.h @@ -74,7 +74,7 @@ struct tlb_client_info { * packets to a Client that the Hash function * gave this entry index. */ - u32 tx_bytes; /* Each Client acumulates the BytesTx that + u32 tx_bytes; /* Each Client accumulates the BytesTx that * were tranmitted to it, and after each * CallBack the LoadHistory is devided * by the balance interval |