Merge branch 'master' of git://www.denx.de/git/u-boot-net

diff --combined README
index f4478a1eb06fe40378824beb7f01bbb14d9496ec,d9c2ee2ed8151c801064105a01c343c49aeff15f..1f920478da790e9e461b6b006461aa919a2ac333
--- 1/README
--- 2/README
+++ b/README
@@@ -1377,14 -1377,6 +1377,14 @@@ The following options need to be config
                SPI configuration items (port pins to use, etc). For
                an example, see include/configs/sacsng.h.
  
 +              CONFIG_HARD_SPI
 +
 +              Enables a hardware SPI driver for general-purpose reads
 +              and writes.  As with CONFIG_SOFT_SPI, the board configuration
 +              must define a list of chip-select function pointers.
 +              Currently supported on some MPC8xxx processors.  For an
 +              example, see include/configs/mpc8349emds.h.
 +
  - FPGA Support: CONFIG_FPGA
  
                Enables FPGA subsystem.
@@@ -2699,6 -2691,10 +2699,10 @@@ Some configuration options can be set u
                  => setenv ethact SCC ETHERNET
                  => ping 10.0.0.1 # traffic sent on SCC ETHERNET
  
+   ethrotate   - When set to "no" U-Boot does not go through all
+                 available network interfaces.
+                 It just stays at the currently selected interface.
+ 
     netretry   - When set to "no" each network operation will
                  either succeed or fail without retrying.
                  When set to "once" the network operation will