Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorWolfgang Denk <wd@denx.de>
Wed, 16 Nov 2011 18:58:52 +0000 (19:58 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 16 Nov 2011 18:58:52 +0000 (19:58 +0100)
commit5428949153e8cd337ecb4180ad4fb68eb88a013b
tree7c54f0101456300cf2fbcb3f7f1a8526376476cc
parent0963ff3a97ff63e85465008895a68eb2e1cdf112
parentaa5512157b76a66858d88e02156894f8cd511791
Merge branch 'master' of git://git.denx.de/u-boot-i2c

* 'master' of git://git.denx.de/u-boot-i2c:
  fsl_i2c: Fix compile warning