From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 May 2012 00:15:47 +0000 (-0700)
Subject: Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4e78f00261886ed2710460f5ca5253f6ab6007cf;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

Pull i2c embedded fixes from Wolfram Sang:
 "Here are some typical i2c driver bugfixes for 3.4.  Missed clock
  handling, improper timeout fixes, hardware wrokarounds...  All
  patches have been in linux-next for a few days, too."

* 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
  i2c: mxs: disable QUEUE when sending is done
  i2c: mxs: handle spurious interrupt
  i2c-eg20t: Modify MODULE_AUTHOR's email address
  i2c-eg20t: change timeout value 50msec to 1000msec
  i2c: tegra: Add delay before resetting the controller after NACK
  i2c: pnx: Disable clk in suspend
---

4e78f00261886ed2710460f5ca5253f6ab6007cf