summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-02 09:12:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-02 09:12:44 -0800
commit3e52d063d809df58da9be59c67d755c0d1ffa7c8 (patch)
treef9a6a8208159f0f120360a6d99a6bef4edb8d1ed /include/net
parent8ab2ae655bfe384335c5b6b0d6041e0ddce26b00 (diff)
parentdfa2ccc30e6556bd526f54f0e16fc9e5af4293cb (diff)
downloadlinux-3e52d063d809df58da9be59c67d755c0d1ffa7c8.tar.bz2
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fix from Wolfram Sang: "Here is the revert for the regression of the i2c-octeon driver I mentioned last time. I wished for a bit more feedback, but all people working actively on it are in need of this patch, so here it goes" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: Revert "i2c: octeon: thunderx: Limit register access retries"
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions