tree 8a08cb56d3b7781dd056f04e8a225af4e7e63220
parent c6ad121784b13760935b3374adcec2268ee31b99
parent a5a595cc36bbbe16f6a3f0e6968f94a0604bfd28
author Linus Torvalds <torvalds@linux-foundation.org> 1298423596 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1298423596 -0800

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