From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Jul 2009 02:39:22 +0000 (-0700)
Subject: Merge branch 'i2c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux
X-Git-Tag: v2.6.31-rc5~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=658874f05d040ca96eb5ba9b1c30ce0ff287d762;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

* 'i2c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c-omap: OMAP3430 Silicon Errata 1.153
  i2c-omap: In case of a NACK|ARDY|AL return from the ISR
  i2c-omap: Bug in reading the RXSTAT/TXSTAT values from the I2C_BUFFSTAT register
  i2c-sh_mobile: change module_init() to subsys_initcall()
  i2c: strncpy does not null terminate string
  i2c-s3c2410: s3c24xx_i2c_init: don't clobber IICLC value
---

658874f05d040ca96eb5ba9b1c30ce0ff287d762