OpenCloudOS-Kernel/Documentation/devicetree
David S. Miller 3ab0a7a0c3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Two minor conflicts:

1) net/ipv4/route.c, adding a new local variable while
   moving another local variable and removing it's
   initial assignment.

2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes.
   One pretty prints the port mode differently, whilst another
   changes the driver to try and obtain the port mode from
   the port node rather than the switch node.

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-09-22 16:45:34 -07:00
..
bindings Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-22 16:45:34 -07:00
booting-without-of.rst docs: dt: convert booting-without-of.txt to ReST format 2020-06-26 11:33:26 -06:00
changesets.rst docs: dt: convert changesets to ReST 2020-05-04 17:09:46 -05:00
dynamic-resolution-notes.rst docs: dt: convert dynamic-resolution-notes.txt to ReST 2020-05-04 17:09:52 -05:00
index.rst docs: dt: convert booting-without-of.txt to ReST format 2020-06-26 11:33:26 -06:00
of_unittest.rst docs: dt: convert of_unittest.txt to ReST 2020-05-04 17:09:52 -05:00
overlay-notes.rst docs: dt: convert overlay-notes.txt to ReST format 2020-05-04 17:09:52 -05:00
usage-model.rst docs: dt: usage_model.rst: fix link for DT usage 2020-05-04 16:22:54 -05:00
writing-schema.rst dt: writing-schema: Miscellaneous grammar fixes 2020-08-19 14:21:04 -06:00