From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Dec 2008 23:05:26 +0000 (-0800)
Subject: Merge branch 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
X-Git-Tag: v2.6.28-rc9~6
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=55dac3a5553b13891f0ae4bbd11920619b5436d4

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

* 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c-s3c2410: fix check for being in suspend.
  i2c-cpm: Detect and report NAK right away instead of timing out
---

55dac3a5553b13891f0ae4bbd11920619b5436d4