David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
bindings	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
00-INDEX
booting-without-of.txt	sun.com documentation fixes	2013-02-21 17:22:20 -08:00
usage-model.txt	doc: device tree: clarify stuff in usage-model.txt.	2013-06-18 13:46:27 +02:00