tree 7ad0858c88d92f7f82f29d164959c19520ada919
parent f5645b5959c002303fd2480e7bcde2b5232b8f86
parent 1e4f0b82577e59f23484c99056c96465e202fdd5
author Linus Torvalds <torvalds@linux-foundation.org> 1336090547 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1336090547 -0700

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