From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jul 2008 02:26:38 +0000 (-0700)
Subject: Merge branch 'i2c-fix' of git://aeryn.fluff.org.uk/bjdooks/linux
X-Git-Tag: v2.6.26-rc9~69
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ad4107ba137f743fc531f9f4ceb81b122f9ff25;p=linux-2.6

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

9ad4107ba137f743fc531f9f4ceb81b122f9ff25