tree f576c875b44d7e24ef95db7f2820b9825d1659f5
parent 9f433e7e88c4c203a03932eacec73d0292efd88b
parent 66e9855a5d3ed76cb91e9e5e149824d472aa9a60
author Wolfgang Denk <wd@denx.de> 1321469942 +0100
committer Wolfgang Denk <wd@denx.de> 1321469942 +0100

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

* 'master' of /home/wd/git/u-boot/custodians:
  fsl_i2c: Fix compile warning