tree aa903cd765ec5284e8ef0ae56006b4f956b7d4f2
parent ff7532ca2c631e7e96dcd305a967b610259dc0ea
parent 9dd3162deb67e9d2dc08af8bedea61c41fae85a8
author Linus Torvalds <torvalds@linux-foundation.org> 1359051423 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1359051423 -0800

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

Pill i2c fixes from Wolfram Sang:
 "Here are a few, typical driver fixes for the I2C subsystem"

* 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
  i2c-designware: add missing MODULE_LICENSE
  i2c: omap: fix draining irq handling
  i2c: omap: errata i462: fix incorrect ack for arbitration lost interrupt
  i2c: muxes: fix wrong use of sizeof(ptr)
  i2c: sirf: register i2c_client from dt child-nodes in probe entry
  i2c: mxs: Fix type of error code
  i2c: mxs: Fix misuse init_completion