| author | Wolfgang Denk <wd@denx.de> | |
| Mon, 9 Apr 2012 15:10:01 +0000 (17:10 +0200) | ||
| committer | Wolfgang Denk <wd@denx.de> | |
| Mon, 9 Apr 2012 15:10:01 +0000 (17:10 +0200) | ||
| commit | 2c734cd932b53b46e9f89e4f5db9360afc459ae6 | |
| tree | c8992dba1b7bfc79ed7248b692d50facbe1b2dc3 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 691288e14dc5cccc9ff1219765554981f73a7c14 | commit | diff |
| parent | cafabe1995af20d02a000a984ae38693a6f9b900 | commit | diff |
Merge branch 'master' of git://git.denx.de/u-boot-net
* 'master' of git://git.denx.de/u-boot-net:
net/designware: Change timeout loop implementation
net/designware: Set ANAR to 0x1e1
net/designware: Program phy registers when auto-negotiation is ON
net/designware: Try configuring phy on each dw_eth_init
net/designware: Consecutive writes must have delay
net/designware: Phy address fix
net/designware: Fix the max frame length size
net/designware: Fix to restore hw mac address
microblaze: Wire up LL_TEMAC driver initialization
microblaze: Add faked LL_TEMAC driver configuration
microblaze: Enable several ethernet driver compilation
net: ll_temac: Add LL TEMAC driver to u-boot
Update net subsystem maintainer in doc/git-mailrc
net/eth.c: fix eth_write_hwaddr() to use dev->enetaddr as fall back
mvgbe: remove warning for unused methods
* 'master' of git://git.denx.de/u-boot-net:
net/designware: Change timeout loop implementation
net/designware: Set ANAR to 0x1e1
net/designware: Program phy registers when auto-negotiation is ON
net/designware: Try configuring phy on each dw_eth_init
net/designware: Consecutive writes must have delay
net/designware: Phy address fix
net/designware: Fix the max frame length size
net/designware: Fix to restore hw mac address
microblaze: Wire up LL_TEMAC driver initialization
microblaze: Add faked LL_TEMAC driver configuration
microblaze: Enable several ethernet driver compilation
net: ll_temac: Add LL TEMAC driver to u-boot
Update net subsystem maintainer in doc/git-mailrc
net/eth.c: fix eth_write_hwaddr() to use dev->enetaddr as fall back
mvgbe: remove warning for unused methods