From: Wolfgang Denk Date: Fri, 13 Jan 2012 19:13:20 +0000 (+0100) Subject: Merge branch 'master' of git://git.denx.de/u-boot-i2c X-Git-Tag: v2012.04-rc1~315^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f5bc38aba82a3cd96ee5ddbae3047f1caa31ed3c;p=oweals%2Fu-boot.git Merge branch 'master' of git://git.denx.de/u-boot-i2c * 'master' of git://git.denx.de/u-boot-i2c: fix: error ATMEL_FIO_BASE undeclared, if use I2C_Soft on AT91 --- f5bc38aba82a3cd96ee5ddbae3047f1caa31ed3c