David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
bindings	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-09-23 12:09:27 -04:00
00-INDEX
booting-without-of.txt
changesets.txt	of: Transactional DT support.	2014-07-23 17:29:15 -06:00
todo.txt	of: Add todo tasklist for Devicetree	2014-07-23 17:33:01 -06:00
usage-model.txt