From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Aug 2012 17:41:36 +0000 (-0700)
Subject: Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux
X-Git-Tag: v3.6-rc3~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2e2d8c93aec7c0f995bf140a00fb15ca2e07ddd4;p=~emulex%2Finfiniband.git

Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux

Pull i2c-embedded fixes from Wolfram Sang:
 "Some bugfixes for the "embedded" part of the I2C subsystem.  The fixes
  affect mostly drivers which have been largely reworked lately and
  where regressions appeared."

* 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
  i2c: tegra: protect suspend/resume callbacks with CONFIG_PM_SLEEP
  i2c: diolan-u2c: Fix master_xfer return code
  I2C: OMAP: xfer: fix runtime PM get/put balance on error
  i2c: nomadik: Add default configuration into the Nomadik I2C driver
---

2e2d8c93aec7c0f995bf140a00fb15ca2e07ddd4