tree 706b3376b46905b64e745ef82cc4b9e0bd808636
parent 993d30de990c614547b457984a46e49425e9625d
parent 78df8c68cd42c9db3601b331018b82e9627d08ce
author Wolfgang Denk <wd@denx.de> 1332017075 +0100
committer Wolfgang Denk <wd@denx.de> 1332017075 +0100

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