diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-06 03:46:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-06 03:46:26 +0200 |
| commit | d247b6ab3ce6dd43665780865ec5fa145d9ab6bd (patch) | |
| tree | 02eb71e4d64b678d7568d2b99f309e08f56ef2fe /fs | |
| parent | cxgb4 : Disable recursive mailbox commands when enabling vi (diff) | |
| parent | tg3: Modify tg3_tso_bug() to handle multiple TX rings (diff) | |
| download | linux-d247b6ab3ce6dd43665780865ec5fa145d9ab6bd.tar.xz linux-d247b6ab3ce6dd43665780865ec5fa145d9ab6bd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/Makefile
net/ipv6/sysctl_net_ipv6.c
Two ipv6_table_template[] additions overlap, so the index
of the ipv6_table[x] assignments needed to be adjusted.
In the drivers/net/Makefile case, we've gotten rid of the
garbage whereby we had to list every single USB networking
driver in the top-level Makefile, there is just one
"USB_NETWORKING" that guards everything.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions