From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Jan 2012 20:25:40 +0000 (-0800)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: v3.3-rc1~69
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f88609a0e447fb73851c0f640ed47257838ff99f;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'i2c-for-linus' of git://git./linux/kernel/git/jdelvare/staging

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  MAINTAINERS: List i2c-omap and i2c-davinci drivers
  MAINTAINERS: i2c: Add third maintainer
  i2c/gpio-i2cmux: Convert to use module_platform_driver()
  i2c/busses: Use module_platform_driver()
  i2c-dev: Use memdup_user
  i2c: Convert to DEFINE_PCI_DEVICE_TABLE
  i2c-ali1535: enable SPARC support
  i2c: Fix error value returned by several bus drivers
---

f88609a0e447fb73851c0f640ed47257838ff99f