From: Wolfgang Denk <wd@denx.de>
Date: Fri, 13 Jan 2012 19:13:26 +0000 (+0100)
Subject: Merge branch 'master' of /home/wd/git/u-boot/custodians
X-Git-Tag: v2012.04-rc1~315
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d877bc099e3a37ac13cfdf20139c1ffcac5c9ac4;p=oweals%2Fu-boot.git

Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  fix: error ATMEL_FIO_BASE undeclared, if use I2C_Soft on AT91
---

d877bc099e3a37ac13cfdf20139c1ffcac5c9ac4