]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 67b99a7 3b4ade9)
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)
commite8caced75fc22c280347b9b5ef30929389b8aa24
tree02fc906c5bc318220ad4827c6eac2521b9d1fbbftree | snapshot
parent67b99a7aed4f4f2c14c9ef61530a922d883c8727commit | diff
parent3b4ade9de433d800e666a2a67d761cd3605734c3commit | 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
Linux Kernel Source Tree.