Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Wed, 18 Apr 2012 20:41:06 +0000 (22:41 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 18 Apr 2012 20:41:06 +0000 (22:41 +0200)
* 'master' of git://git.denx.de/u-boot-sh:
  sh: ecovec: Change macro from BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT
  sh: Fix rsk7264 pin setup for on-board ethernet


Trivial merge