| commit | d247b6ab3ce6dd43665780865ec5fa145d9ab6bd | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Aug 05 18:46:26 2014 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Tue Aug 05 18:46:26 2014 -0700 |
| tree | 02eb71e4d64b678d7568d2b99f309e08f56ef2fe | |
| parent | 30f00847953e3aa3f710d62ffd37b42042807900 [diff] | |
| parent | 4d8fdc95c60e90d84c8257a0067ff4b1729a3757 [diff] |
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>