From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Mar 2012 02:24:52 +0000 (-0800)
Subject: Merge branch 'i2c-embedded/for-3.3' of git://git.pengutronix.de/git/wsa/linux-2.6
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~15475
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a223c522805d4e9de4903fdd9c14588e558b2c16;p=mirror_ubuntu-artful-kernel.git

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
---

a223c522805d4e9de4903fdd9c14588e558b2c16