Merge branch 'i2c-fix' of git://aeryn.fluff.org.uk/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 02:26:38 +0000 (19:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 02:26:38 +0000 (19:26 -0700)
commit9ad4107ba137f743fc531f9f4ceb81b122f9ff25
treebe890fbc624349ffc0bbe843fb8bd05cd13d1beb
parent0e77a07ff9d18cdfc6c1fdd5b3c667ae79895489
parentd150a4bbd0e5c6427e66086b139953428680160b
Merge branch 'i2c-fix' of git://aeryn.fluff.org.uk/bjdooks/linux

* 'i2c-fix' of git://aeryn.fluff.org.uk/bjdooks/linux:
  I2C: S3C2410: Add MODULE_ALIAS() for s3c2440 device.
  I2C: S3C2410: Fixup error codes returned rom a transfer.
  I2C: S3C2410: Check ACK on byte transmission