]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d068b02 50dddff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 2 Oct 2014 18:25:43 +0000 (11:25 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Oct 2014 18:25:43 +0000 (11:25 -0700)
commit739e4a758e0e2930f4bcdddd244254bae8dd7499
tree0179d038669ad55591ae05a90b210d7090edf56etree
parentd068b02cfdfc27f5962ec82ec5568b706f599edccommit | diff
parent50dddff3cb9af328dd42bafe3437c7f47e8b38a9commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/usb/r8152.c
net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/usb/r8152.c diff1 | diff2 | blob | history
lib/rhashtable.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/ipv4/ip_tunnel.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/ipv6/ip6_gre.c diff1 | diff2 | blob | history
net/ipv6/ip6_tunnel.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/netfilter/Kconfig diff1 | diff2 | blob | history
net/netfilter/nfnetlink.c diff1 | diff2 | blob | history
Ubuntu combined Linux kernel mirror