Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Mar 2014 04:25:40 +0000 (21:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Mar 2014 04:25:40 +0000 (21:25 -0700)
commitc14c06b77d151352a4de73505e954b6df55fd23b
treea37a5f47e92b854251efc53b9dfcfe748e822d53
parent53611c0ce9f6e2fa2e31f9ab4ad8c08c512085ba
parent62c19c9d29e65086e5ae76df371ed2e6b23f00cd
Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux

Pull i2c Kconfig fix from Wolfram Sang.

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: Remove usage of orphaned symbol OF_I2C