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)
commitb9750264019c2bbcc67db5631734f7ad765ea7c2
treef576c875b44d7e24ef95db7f2820b9825d1659f5
parente4ed004b65caf6e79117b9ff2648f7b7c3afe58d
parent5428949153e8cd337ecb4180ad4fb68eb88a013b
Merge branch 'master' of /home/wd/git/u-boot/custodians

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