diff options
| author | David S. Miller <davem@davemloft.net> | 2014-04-24 19:19:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-24 19:19:00 +0200 |
| commit | 4366004d77278a90c18f92f7cb9ec0c264da563d (patch) | |
| tree | 4fb046b6b06cc681f791a8ddf7507b5f8eb99be8 /Documentation | |
| parent | bonding: Add tlb_dynamic_lb parameter for tlb mode (diff) | |
| parent | smc91x: improve definition of debug macros (diff) | |
| download | linux-4366004d77278a90c18f92f7cb9ec0c264da563d.tar.xz linux-4366004d77278a90c18f92f7cb9ec0c264da563d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/igb/e1000_mac.c
net/core/filter.c
Both conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/scaling.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/scaling.txt b/Documentation/networking/scaling.txt index ca6977f5b2ed..99ca40e8e810 100644 --- a/Documentation/networking/scaling.txt +++ b/Documentation/networking/scaling.txt @@ -429,7 +429,7 @@ RPS and RFS were introduced in kernel 2.6.35. XPS was incorporated into (therbert@google.com) Accelerated RFS was introduced in 2.6.35. Original patches were -submitted by Ben Hutchings (bhutchings@solarflare.com) +submitted by Ben Hutchings (bwh@kernel.org) Authors: Tom Herbert (therbert@google.com) |