linux/Documentation/devicetree
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
bindings Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04: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