Merge git://git.denx.de/u-boot-dm

diff --combined README
index 7594f3c,53502c0..06f3ed0
--- 1/README
--- 2/README
+++ b/README
@@@ -1603,6 -1603,15 +1603,15 @@@ The following options need to be config
  
                See doc/README.link-local for more information.
  
+  - MAC address from environment variables
+ 
+               FDT_SEQ_MACADDR_FROM_ENV
+ 
+               Fix-up device tree with MAC addresses fetched sequentially from
+               environment variables. This config work on assumption that
+               non-usable ethernet node of device-tree are either not present
+               or their status has been marked as "disabled".
+ 
   - CDP Options:
                CONFIG_CDP_DEVICE_ID
  
@@@ -2168,6 -2177,16 +2177,6 @@@
                currently only supports clearing the memory.
  
  - Error Recovery:
 -              CONFIG_PANIC_HANG
 -
 -              Define this variable to stop the system in case of a
 -              fatal error, so that you have to reset it manually.
 -              This is probably NOT a good idea for an embedded
 -              system where you want the system to reboot
 -              automatically as fast as possible, but it may be
 -              useful during development since you can try to debug
 -              the conditions that lead to the situation.
 -
                CONFIG_NET_RETRY_COUNT
  
                This variable defines the number of retries for