Merge branch 'i2c-for-2631-rc3' of git://aeryn.fluff.org.uk/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jul 2009 01:40:15 +0000 (18:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jul 2009 01:40:15 +0000 (18:40 -0700)
commite9e961c9a818a2f24711af493b907a8e40a69efc
tree66960fe0f8085959b53596d4747d1381a2cbc50e
parent8aa651e23e2835b6d64381ce17447c995040ab30
parent593308259bbd335eda9c5280cdd1f7883c746211
Merge branch 'i2c-for-2631-rc3' of git://aeryn.fluff.org.uk/bjdooks/linux

* 'i2c-for-2631-rc3' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c: Use resource_size
  i2c-davinci: behave with i2cdetect
  i2c-davinci: convert clock usage after clkdev conversion