From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Nov 2012 22:14:54 +0000 (-0700)
Subject: Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux
X-Git-Tag: v3.7-rc4~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=209c510e3666333ad58d3080ff3ba573474a6b05;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

Pull i2c embedded fixes from Wolfram Sang:
 "Two patches are usual stuff.

  The bigger patch is needed to correct a wrong decision made in this
  merge window.  We hoped to get the PIOQUEUE mode in the mxs driver
  working with DMA, but it turned out to be too broken (leading to data
  loss), so we now think it is best to remove it entirely and work only
  with DMA now.  The patch should be in 3.7.  IMO, so users never get
  the chance to use both modes in parallel."

* 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
  i2c: tegra: set irq name as device name
  i2c-nomadik: Fixup clock handling
  i2c: mxs: remove broken PIOQUEUE support
---

209c510e3666333ad58d3080ff3ba573474a6b05