linux_old1/Documentation/devicetree
David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/renesas/ravb_main.c
	kernel/bpf/syscall.c
	net/ipv4/ipmr.c

All three conflicts were cases of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-03 21:09:12 -05:00
..
bindings Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-03 21:09:12 -05:00
00-INDEX
booting-without-of.txt ARM: 8354/1: Documentation: devicetree: root node serial-number property documentation 2015-05-08 10:42:34 +01:00
changesets.txt
dynamic-resolution-notes.txt
of_unittest.txt Documentation: rename of_selftest.txt to of_unittest.txt 2015-03-25 00:50:53 -05:00
overlay-notes.txt
todo.txt
usage-model.txt