tree f0d52e4b47a589d77c91f1fa31bdd9f2d23dc055
parent ad0b40fa944628d6f30b40266a599b285d70a266
parent 52795f6fdeb8a2b98373108ac2838c674bb2cbc4
author Linus Torvalds <torvalds@linux-foundation.org> 1454279392 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1454279392 -0800

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

Pull i2c fixes from Wolfram Sang:
 "Here are two I2C driver regression fixes.  piix4 gets a larger
  overhaul fixing the latest refactoring and also an older known issue
  as well.  designware-pci gets a fix for a bad merge conflict
  resolution"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: piix4: don't regress on bus names
  i2c: designware-pci: use IRQF_COND_SUSPEND flag
  i2c: piix4: Fully initialize SB800 before it is registered
  i2c: piix4: Fix SB800 locking