tree 66960fe0f8085959b53596d4747d1381a2cbc50e
parent 8aa651e23e2835b6d64381ce17447c995040ab30
parent 593308259bbd335eda9c5280cdd1f7883c746211
author Linus Torvalds <torvalds@linux-foundation.org> 1247622015 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1247622015 -0700

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