git.stricted.de - GitHub/LineageOS/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 39f3336 c5b4616)

author	David S. Miller <davem@davemloft.net>
	Wed, 11 Jun 2014 23:02:55 +0000 (16:02 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 11 Jun 2014 23:02:55 +0000 (16:02 -0700)
commit	902455e00720018d1dbd38327c3fd5bda6d844ee
tree	02fc906c5bc318220ad4827c6eac2521b9d1fbbf	tree \| snapshot (tar.gz zip)
parent	39f33367e420d88b3cbbd474e5bcc326338ef324	commit \| diff
parent	c5b46160877a9bb23ab6f96fb666e7766f407704	commit \| diff

Merge git://git./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