diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-08 00:45:40 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-08 00:45:40 +0400 |
| commit | b37e3b6d64358604960b35e8ecbb7aed22e0926e (patch) | |
| tree | f9673afc2332c15a989d3b32f002363a92ea66e1 /drivers/net/bonding/bond_alb.h | |
| parent | a90c7a313a1c5b4fc99f987a2ae8f92ab0ae35c7 (diff) | |
| parent | bd39a274fb7b43374c797bafdb7f506598f36f77 (diff) | |
| download | linux-b37e3b6d64358604960b35e8ecbb7aed22e0926e.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/rtlwifi/efuse.c
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.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 |