linux_dsm_epyc7002/Documentation/devicetree
David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/r8152.c
	drivers/net/xen-netback/netback.c

Both the r8152 and netback conflicts were simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-14 22:31:55 -04:00
..
bindings Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-14 22:31:55 -04:00
00-INDEX Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
booting-without-of.txt dt/bindings: Remove all references to device_type "ethernet-phy" 2014-01-16 11:11:51 +00:00
usage-model.txt doc: device tree: clarify stuff in usage-model.txt. 2013-06-18 13:46:27 +02:00