From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Aug 2011 22:54:30 +0000 (-0700)
Subject: Merge branch 'for-31-rc3/i2c-fixes' of git://git.fluff.org/bjdooks/linux
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=650cf77d750153a5c1f51ae78a93f399151032d1;p=linux-beck.git

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

* 'for-31-rc3/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
  i2c-nomadik: fix kerneldoc warning
  Revert "i2c-omap: fix static suspend vs. runtime suspend"
  i2c-nomadik: Do not use _interruptible_ variant call
---

650cf77d750153a5c1f51ae78a93f399151032d1