From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Sep 2011 23:42:34 +0000 (-0700)
Subject: Merge branch 'for-31-rc5/i2c-fixes' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: v3.1-rc6~21
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=4dcaadc3193d494baed79dc2055a6eefbebe0454

Merge branch 'for-31-rc5/i2c-fixes' of git://git.fluff.org/bjdooks/linux

* 'for-31-rc5/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
  i2c-tegra: fix possible race condition after tx
  i2c-tegra: add I2C_FUNC_SMBUS_EMUL
  i2c-tegra: Add of_match_table
  i2c-pxa2xx: return proper error code in ce4100_i2c_probe error paths
---

4dcaadc3193d494baed79dc2055a6eefbebe0454