diff options
| author | Wolfgang Denk <[email protected]> | 2012-04-09 17:10:01 +0200 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2012-04-09 17:10:01 +0200 |
| commit | 2c734cd932b53b46e9f89e4f5db9360afc459ae6 (patch) | |
| tree | c8992dba1b7bfc79ed7248b692d50facbe1b2dc3 /doc | |
| parent | 691288e14dc5cccc9ff1219765554981f73a7c14 (diff) | |
| parent | cafabe1995af20d02a000a984ae38693a6f9b900 (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
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/git-mailrc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/git-mailrc b/doc/git-mailrc index 4a7d74d8b5c..c8a6390e1dc 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -18,6 +18,7 @@ alias gruss Graeme Russ <[email protected]> alias hs Heiko Schocher <[email protected]> alias iwamatsu Nobuhiro Iwamatsu <[email protected]> alias jasonjin Jason Jin <[email protected]> +alias jhersh Joe Hershberger <[email protected]> alias kimphill Kim Phillips <[email protected]> alias macpaul Macpaul Lin <[email protected]> alias marex Marek Vasut <[email protected]> @@ -97,6 +98,6 @@ alias fdt uboot, Jerry Van Baren <[email protected]> alias i2c uboot, hs alias mmc uboot, afleming alias nand uboot, scottwood -alias net uboot, wd +alias net uboot, jhersh alias usb uboot, marex alias video uboot, ag |