From: Wolfgang Denk <wd@denx.de>
Date: Sun, 20 May 2012 20:33:44 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-net
X-Git-Tag: v2012.07-rc1~143
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8bd07c9aaf4628931ab8da6eb0f83e517d9381a7;p=oweals%2Fu-boot.git

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

* 'master' of git://git.denx.de/u-boot-net:
  net: move bootfile init into eth_initialize
  net: punt bd->bi_ip_addr
  net: cosmetic: netconsole.c checkpatch compliance
  net: cosmetic: tftp.* checkpatch compliance
  net: cosmetic: sntp.* checkpatch compliance
  net: cosmetic: rarp.* checkpatch compliance
  net: cosmetic: nfs.* checkpatch compliance
  net: cosmetic: net.c checkpatch compliance
  net: cosmetic: eth.c checkpatch compliance
  net: cosmetic: bootp.* checkpatch compliance
  net: cosmetic: net.h checkpatch compliance
  net: Remove volatile from net API
---

8bd07c9aaf4628931ab8da6eb0f83e517d9381a7