]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4880efa a583a88)
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)
commit6caa343ee555d44319f8955aa3e1db90bb6e46c4
tree02fc906c5bc318220ad4827c6eac2521b9d1fbbftree | snapshot
parent4880efac4aa839b63dda9d2fcb67c312f3e004f6commit | diff
parenta583a8824f5e60cf461aba82c7cfc0b14be63264commit | 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.