Commit e6ff4c75 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Merge net into net-next because some upcoming net-next changes
build on top of bug fixes that went into net.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ee9c799c 0e255f1c

Documentation/devicetree/usage-model.txt

+5 −3
Original line number Diff line number Diff line
@@ -191,9 +191,11 @@ Linux it will look something like this: 
	};



The bootargs property contains the kernel arguments, and the initrd-*

properties define the address and size of an initrd blob.  The

chosen node may also optionally contain an arbitrary number of

additional properties for platform-specific configuration data.

properties define the address and size of an initrd blob.  Note that

initrd-end is the first address after the initrd image, so this doesn't

match the usual semantic of struct resource.  The chosen node may also

optionally contain an arbitrary number of additional properties for

platform-specific configuration data.



During early boot, the architecture setup code calls of_scan_flat_dt()

several times with different helper callbacks to parse device tree