]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Mar 2015 16:50:45 +0000 (09:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Mar 2015 16:50:45 +0000 (09:50 -0700)
Pull i2c fix from Wolfram Sang:
 "An important bugfix for the I2C subsystem core"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  Revert "i2c: core: Dispose OF IRQ mapping at client removal time"


Trivial merge