]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 39f3336 c5b4616)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Jun 2014 23:02:55 +0000 (16:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Jun 2014 23:02:55 +0000 (16:02 -0700)
commit902455e00720018d1dbd38327c3fd5bda6d844ee
tree02fc906c5bc318220ad4827c6eac2521b9d1fbbftree
parent39f33367e420d88b3cbbd474e5bcc326338ef324commit | diff
parentc5b46160877a9bb23ab6f96fb666e7766f407704commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
net/core/rtnetlink.c
net/core/skbuff.c

Both conflicts were very simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/net/bpf_jit_comp.c diff1 | diff2 | blob | history
drivers/net/macvlan.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/dns_resolver/dns_query.c diff1 | diff2 | blob | history
net/ipv4/ip_tunnel.c diff1 | diff2 | blob | history
net/ipv4/ipip.c diff1 | diff2 | blob | history
net/ipv6/output_core.c diff1 | diff2 | blob | history
net/ipv6/sit.c diff1 | diff2 | blob | history
net/mac80211/iface.c diff1 | diff2 | blob | history
Ubuntu combined Linux kernel mirror