From: Wolfgang Denk <wd@denx.de>
Date: Thu, 7 Jun 2012 21:34:11 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-sh
X-Git-Tag: v2012.07-rc1~42
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=76aef69e49318863cb9966f872a80ddb5586d666;p=karo-tx-uboot.git

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

* 'master' of git://git.denx.de/u-boot-sh:
  sh/ap_sh4a_4a: Fix typo of operator in ET0_ETXD4
  sh: Add SH7269 device and RSK2+SH7269 board
  sh: Set CONFIG_SH_ETHER_PHY_MODE and CONFIG_SH_ETHER_SH7734_MII to boards with sh_eth
  sh: Add support for AP-SH4A-4A board
  sh: Add register definition of PFC for SH7734
  sh: r0p7734: Add support I2C controller
  sh: Add bit control functions
  sh: Add support for r0p7734 board
  sh: Add support Renesas SH7734

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

76aef69e49318863cb9966f872a80ddb5586d666