From: Wolfgang Denk <wd@denx.de>
Date: Mon, 30 Jul 2012 18:39:52 +0000 (+0200)
Subject: Merge branch 'next' of git://git.denx.de/u-boot
X-Git-Tag: v2012.10-rc1~415^2~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b98b611502f5e0a85a1f8e15cf46c470cb105614;p=oweals%2Fu-boot.git

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

* 'next' of git://git.denx.de/u-boot:
  MPC8xx: Fixup warning in arch/powerpc/cpu/mpc8xx/cpu.c
  doc: cleanup - move board READMEs into respective board directories
  net: sh_eth: add support for SH7757's GETHER
  net: sh_eth: modify the definitions of regsiter
  net: sh_eth: add SH_ETH_TYPE_ condition
  net: sh_eth: clean up for the SH7757's code
  net: fec_mxc: Fix MDC for xMII
  net: fec_mxc: Fix setting of RCR for xMII
  net: nfs: make NFS_TIMEOUT configurable
  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>
---

b98b611502f5e0a85a1f8e15cf46c470cb105614