projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 30f0084 4d8fdc9)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Aug 2014 01:46:26 +0000 (18:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Aug 2014 01:46:26 +0000 (18:46 -0700)
commitd247b6ab3ce6dd43665780865ec5fa145d9ab6bd
tree02eb71e4d64b678d7568d2b99f309e08f56ef2fetree | snapshot
parent30f00847953e3aa3f710d62ffd37b42042807900commit | diff
parent4d8fdc95c60e90d84c8257a0067ff4b1729a3757commit | diff
Merge git://git./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>
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c diff1 | diff2 | blob | history
net/bridge/br_fdb.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/ipv4/ip_tunnel.c diff1 | diff2 | blob | history
net/ipv6/sysctl_net_ipv6.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
net/netfilter/xt_LED.c diff1 | diff2 | blob | history
net/sctp/output.c diff1 | diff2 | blob | history
John Crispins staging tree