tree a62069f861d3c587b8165ad2aecca4c97dced215
parent 91a5698d1f253d30f53f0c58d2504eaec481b854
parent cd086d3aa6f7f7bf4d4e1f9fa09af0f0b6bb99ec
author Linus Torvalds <torvalds@linux-foundation.org> 1248921562 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1248921562 -0700

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