From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Mar 2010 23:56:25 +0000 (-0800)
Subject: Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: Ubuntu-5.0.0-8.9~23921
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dd04265b028c00c365a78f9ff78a05e217f98656;p=mirror_ubuntu-disco-kernel.git

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

* 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux:
  i2c: Add support for Xilinx XPS IIC Bus Interface
  i2c: omap: Add support for 16-bit registers
  i2c-pnx: fix setting start/stop condition
  powerpc: doc/dts-bindings: update doc of FSL I2C bindings
  i2c-mpc: add support for the MPC512x processors from Freescale
  i2c-mpc: rename "setclock" initialization functions to "setup"
  i2c-mpc: use __devinit[data] for initialization functions and data
  i2c/imx: don't add probe function to the driver struct
  i2c: Add support for Ux500/Nomadik I2C controller
---

dd04265b028c00c365a78f9ff78a05e217f98656