328
parent cfa5555cabbc89e31b5866d0473beddc147bae9b
parent 844990daa2e69a4258049ba9c2bae1180657dac3
author Linus Torvalds <torvalds@linux-foundation.org> 1330655092 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1330655092 -0800

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

i2c bugfix from Wolfram Sang:
  "This patch fixes a wrong assumption in the mxs-i2c-driver about a
   command queue being done.  Without it, we have seen races when the
   bus was under load."

* 'i2c-embedded/for-3.3' of git://git.pengutronix.de/git/wsa/linux-2.6:
  i2c: mxs: only flag completion when queue is completely done
aåt›5x