diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-29 23:13:44 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-29 23:13:44 +0300 |
commit | e77aee1326f7691763aa968eee2f57db37840b9d (patch) | |
tree | e9d1f608e9dc02c5a7f5ee5d5ec19561912794b3 /net/unix/af_unix.c | |
parent | 1b46b921b0b92bfc507d29a39f1b265c48ed45be (diff) | |
parent | 0204081128d582965e9e39ca83ee6e4f7d27142b (diff) | |
download | linux-e77aee1326f7691763aa968eee2f57db37840b9d.tar.xz |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"A core fix for ACPI matching and two driver bugfixes"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: iproc: Fix shifting 31 bits
i2c: rcar: in slave mode, clear NACK earlier
i2c: acpi: Remove dead code, i.e. i2c_acpi_match_device()
i2c: core: Don't fail PRP0001 enumeration when no ID table exist
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions