]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'linux-uek/topic/uek-4.1/dtrace' into uek/uek-4.1-next
authorNicolas Droux <nicolas.droux@oracle.com>
Thu, 22 Jun 2017 17:41:45 +0000 (11:41 -0600)
committerNicolas Droux <nicolas.droux@oracle.com>
Thu, 22 Jun 2017 17:41:45 +0000 (11:41 -0600)
1  2 
net/ipv4/ip_output.c
net/ipv6/ip6_output.c
net/ipv6/mcast.c

Simple merge
Simple merge
Simple merge