From: Linus Torvalds Date: Fri, 14 Mar 2014 04:25:40 +0000 (-0700) Subject: Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa... X-Git-Tag: firefly_0821_release~176^2~4289 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c14c06b77d151352a4de73505e954b6df55fd23b;p=firefly-linux-kernel-4.4.55.git 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 --- c14c06b77d151352a4de73505e954b6df55fd23b