From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Feb 2011 01:13:16 +0000 (-0800)
Subject: Merge branch 'for-2639-rc4/i2c-fixes' of git://git.fluff.org/bjdooks/linux
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4a508dd259f5995b8d31c576b894263f5947d654;p=deliverable%2Flinux.git

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

* 'for-2639-rc4/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
  i2c-omap: fixup commit cb527ede1bf6ff2008a025606f25344b8ed7b4ac whitespace
  i2c-omap: Double clear of ARDY status in IRQ handler
  i2c-omap: fix build for !CONFIG_SUSPEND
  i2c-omap: fix static suspend vs. runtime suspend
  i2c-stu300: make sure adapter-name is terminated
---

4a508dd259f5995b8d31c576b894263f5947d654