tree e77a60e46844adf71758bad41d77d40658acd7eb
parent 14577beb8293c187a12d2e78ac6250d5dcec2190
parent 97491ba3f64c2137101efdfe7593305d692d7d63
author Linus Torvalds <torvalds@linux-foundation.org> 1300813527 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300813527 -0700

Merge branch 'for-linus/2639/i2c-2' of git://git.fluff.org/bjdooks/linux

* 'for-linus/2639/i2c-2' of git://git.fluff.org/bjdooks/linux:
  i2c-pxa2xx: Don't clear isr bits too early
  i2c-pxa2xx: Fix register offsets
  i2c-pxa2xx: pass of_node from platform driver to adapter and publish
  i2c-pxa2xx: check timeout correctly
  i2c-pxa2xx: add support for shared IRQ handler
  i2c-pxa2xx: Add PCI support for PXA I2C controller
  ARM: pxa2xx: reorganize I2C files
  i2c-pxa2xx: use dynamic register layout
  i2c-mxs: set controller to pio queue mode after reset
  i2c-eg20t: support new device OKI SEMICONDUCTOR ML7213 IOH
  i2c/busses: Add support for Diolan U2C-12 USB-I2C adapter