tree a30261796868545d6b29ff062332433b460c3e2e
parent 8d15b0ec32f20a57881dc073b2e8d11dea0ccceb
parent 4eaad8ad296a78689f148c8dcd383fc4e51ee123
author Linus Torvalds <torvalds@linux-foundation.org> 1245212802 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1245212802 -0700

Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux

* 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c-stu300: Make driver depend on MACH_U300
  i2c-s3c2410: use resource_size()
  i2c: Use resource_size macro
  i2c: ST DDC I2C U300 bus driver v3
  i2c-bfin-twi: pull in io.h for ioremap()