David S. Miller 6bb8824732 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/ipv6/ip6_gre.c is a case of parallel adds. include/trace/events/tcp.h is a little bit more tricky. The removal of in-trace-macro ifdefs in 'net' paralleled with moving show_tcp_state_name and friends over to include/trace/events/sock.h in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-29 15:42:26 -05:00
..
bindings	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
00-INDEX
booting-without-of.txt	dt-bindings: update OpenFirmware document links to devicetree.org	2017-08-01 12:24:07 -05:00
changesets.txt
dynamic-resolution-notes.txt
of_unittest.txt
overlay-notes.txt	of: overlay: rename identifiers to more reflect what they do	2017-10-17 20:46:17 -05:00
todo.txt
usage-model.txt	of: update ePAPR references to point to Devicetree Specification	2017-06-22 11:22:06 -05:00