summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-03-03 14:55:20 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-03-03 14:55:20 -0800
commit58bdf601c2de6071d0386a7a6fa707bd04761c47 (patch)
tree68ea7e26bca786b88f023d0adce030c767875af1 /fs
parent20f14172cbb8d711a47d336355fa947631444f60 (diff)
parent7c4246797b84e55e2dfaaf8a18033de9df7c18c1 (diff)
Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: "A driver fix and a documentation fix (which makes dependency handling for the next cycle easier)" * 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: octeon: Prevent error message on bus error dt-bindings: at24: sort manufacturers alphabetically
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions