tree 2c94f76f4b6f6ab683257e8e7c9480a85d6c3942
parent d1433d55c75652e7af76b32188a1b5f8af654ab3
parent 4560d67722816cca4b2f3dfb1d7c5b902fd2075b
author Linus Torvalds <torvalds@linux-foundation.org> 1408655264 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1408655264 -0700

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

Pull i2c fixes from Wolfram Sang:
 "Here is the fixup for the 'lowlight' of my last pull request.  I2C is
  not selected anymore by I2C_ACPI.  Instead, the code in question now
  depends on I2C=y.

  Also, Mika has agreed to support me and be the maintainer for I2C-ACPI
  related patches.  Finally, a new-ID-patch came along last week"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  MAINTAINERS: add maintainer for ACPI parts of I2C
  i2c: i801: Add PCI ID for Intel Braswell
  i2c: rework kernel config I2C_ACPI