]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorWolfgang Denk <wd@denx.de>
Fri, 13 Jan 2012 19:13:20 +0000 (20:13 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 13 Jan 2012 19:13:20 +0000 (20:13 +0100)
commitf5bc38aba82a3cd96ee5ddbae3047f1caa31ed3c
tree0dde4a750c6b6adccd1ed925554023a1bdabd4cd
parentc30186c60af24bc397b733910ca6fc39e74515f2
parent781322755f11b8f75f6a0a93ae51d36cd7862be1
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