From: Linus Torvalds Date: Fri, 19 Jun 2015 03:02:27 +0000 (-1000) 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~1643 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e640a280ccb9c448a3d9d522ea730ce00efa8cf0;p=firefly-linux-kernel-4.4.55.git Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux Pull i2c documentation fix from Wolfram Sang: "Here is a small documentation fix for I2C. We already had a user who unsuccessfully tried to get the new slave framework running with the currently broken example. So, before this happens again, I'd like to have this how-to-use section fixed for 4.1 already. So that no more hacking time is wasted" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: slave: fix the example how to instantiate from userspace --- e640a280ccb9c448a3d9d522ea730ce00efa8cf0