tree 7bf5d11aee0efed70b6041380e5bcfa64c549a78
parent 9b7b819ca1e508195feed5ece558dca66adeef05
parent 8d487a43c36b54a029d74ad3b0a6a9d1253e728a
author Linus Torvalds <torvalds@linux-foundation.org> 1433523283 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1433523283 -0700

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c bug fixes from Wolfram Sang:
 "Two small bugfixes for I2C"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: s3c2410: fix oops in suspend callback for non-dt platforms
  i2c: hix5hd2: Fix modalias to make module auto-loading work