From: Linus Torvalds Date: Thu, 7 Apr 2011 18:14:49 +0000 (-0700) Subject: Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6 X-Git-Tag: upstream/snapshot3+hdmi~10700 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42933bac11e811f02200c944d8562a15f8ec4ff0;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6 * 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings --- 42933bac11e811f02200c944d8562a15f8ec4ff0 diff --cc drivers/net/bonding/bond_alb.h index 4b3e358,b3bc750..86861f0 --- a/drivers/net/bonding/bond_alb.h +++ b/drivers/net/bonding/bond_alb.h @@@ -74,9 -74,9 +74,9 @@@ 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 + * CallBack the LoadHistory is divided * by the balance interval */ u32 load_history; /* This field contains the amount of Bytes