From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Jul 2009 01:40:15 +0000 (-0700)
Subject: Merge branch 'i2c-for-2631-rc3' of git://aeryn.fluff.org.uk/bjdooks/linux
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e9e961c9a818a2f24711af493b907a8e40a69efc;p=openwrt%2Fstaging%2Fblogic.git

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
---

e9e961c9a818a2f24711af493b907a8e40a69efc