From: Wolfgang Denk <wd@denx.de>
Date: Thu, 12 Jul 2012 06:23:58 +0000 (+0200)
Subject: Merge branch 'next' of git://git.denx.de/u-boot-net into next
X-Git-Tag: v2012.10-rc1~415^2~35^2~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0878222fed3fafbfd0b1f2e5a6b2da90a81e910d;p=oweals%2Fu-boot.git

Merge branch 'next' of git://git.denx.de/u-boot-net into next

* 'next' of git://git.denx.de/u-boot-net:
  net: Inline the new eth_setenv_enetaddr_by_index function
  net: allow setting env enetaddr from net device setting
  net/designware: Consecutive writes to the same register to be avoided
  CACHE: net: asix: Fix asix driver to work with data cache on
  net: phy: micrel: make ksz9021 phy accessible
  net: abort network initialization if the PHY driver fails
  phylib: phy_startup() should return an error code on failure
  net: tftp: fix type of block arg to store_block

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

0878222fed3fafbfd0b1f2e5a6b2da90a81e910d