Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Wed, 16 Nov 2011 18:59:02 +0000 (19:59 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 16 Nov 2011 18:59:02 +0000 (19:59 +0100)
* 'master' of /home/wd/git/u-boot/custodians:
  fsl_i2c: Fix compile warning


Trivial merge