From: Wolfgang Denk Date: Sat, 17 Mar 2012 20:44:35 +0000 (+0100) Subject: Merge branch 'master' of git://git.denx.de/u-boot-sh X-Git-Tag: v2012.04-rc1~65 X-Git-Url: https://git.librecmc.org/?p=oweals%2Fu-boot.git;a=commitdiff_plain;h=df25d49959da75cfaa1e4708669ef550d0000ce6 Merge branch 'master' of git://git.denx.de/u-boot-sh * 'master' of git://git.denx.de/u-boot-sh: sh: timer: Remove unnecessary variable 'ticks' sh: Fix sh7264 clock speed and related serial setting net: sh_eth: Remove unnecessary return net: sh_eth: Collect up EDMR_INIT_CNT to TIMEOUT_CNT net: sh_eth: Remove SH_ETH_PHY_DELAY sh: ecovec: Add support PHY of SMSC sh: sh_eth: Add support SH7724 --- df25d49959da75cfaa1e4708669ef550d0000ce6