Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Fri, 13 Jan 2012 19:13:26 +0000 (20:13 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 13 Jan 2012 19:13:26 +0000 (20:13 +0100)
commitd877bc099e3a37ac13cfdf20139c1ffcac5c9ac4
tree6f772cb1521c6a1974dcb405008a6263943a2818
parentf563db33c1085bf7d616b98cac62337beb65b0a2
parentf5bc38aba82a3cd96ee5ddbae3047f1caa31ed3c
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