From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Nov 2012 21:59:26 +0000 (-1000)
Subject: Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux
X-Git-Tag: Ubuntu-5.2.0-15.16~16785
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=33f145934025e2f51e866993f09e04a1d1650649;p=mirror_ubuntu-eoan-kernel.git

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

Pull i2c fixes from Wolfram Sang:
 "Bugfixes for the i2c subsystem.

  Except for a few one-liners, there is mainly one revert because of an
  overlooked dependency.  Since there is no linux-next at the moment, I
  did some extra testing, and all was fine for me."

* 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
  i2c: mxs: Handle i2c DMA failure properly
  i2c: s3c2410: Fix code to free gpios
  i2c: omap: ensure writes to dev->buf_len are ordered
  Revert "ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints"
  i2c: at91: fix SMBus quick command
---

33f145934025e2f51e866993f09e04a1d1650649