Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Sun, 20 May 2012 20:33:44 +0000 (22:33 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 20 May 2012 20:33:44 +0000 (22:33 +0200)
commit8bd07c9aaf4628931ab8da6eb0f83e517d9381a7
treea0b3d31f7b56426cef184f8e6c21fff2aedf49ce
parentee3a55fdf00b54391e406217e53674449e70d78b
parentde30122bb58fee7b0f94bcfabab595b6ad757336
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
include/common.h