]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
projects / karo-tx-uboot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f563db3 f5bc38a)
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)
* 'master' of /home/wd/git/u-boot/custodians:
  fix: error ATMEL_FIO_BASE undeclared, if use I2C_Soft on AT91


Trivial merge
UBoot for KaRo TX COM modules