Merge git://www.denx.de/git/u-bootConflicts: drivers/Makefile
Merge commit '87ddedd'
drivers/net : move net drivers to drivers/netSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
123