android_kernel_motorola_sm6225/Documentation/devicetree
David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/s390/net/bpf_jit_comp.c
	drivers/net/ethernet/ti/netcp_ethss.c
	net/bridge/br_multicast.c
	net/ipv4/ip_fragment.c

All four conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-31 23:52:20 -07:00
..
bindings Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-07-31 23:52:20 -07: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: Introduce Device Tree resolve support. 2014-10-04 21:24:26 +01:00
of_unittest.txt Documentation: rename of_selftest.txt to of_unittest.txt 2015-03-25 00:50:53 -05:00
overlay-notes.txt Documentation: devicetree: Fix double words in Doumentation/devicetree 2015-01-28 15:13:11 -07:00
todo.txt of: Eliminate of_allnodes list 2014-11-04 13:29:38 +00:00
usage-model.txt