diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-17 08:15:41 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-17 08:15:41 -0800 |
commit | 6b27354cca8e9d9ab7c5bfb8a34101d52b5e48c4 (patch) | |
tree | d4e334035b57b4dbd8bb32dc9d2c637652832307 /drivers/net/slip/slip.c | |
parent | 1d4c79ed324ad780cfc3ad38364ba1fd585dd2a8 (diff) | |
parent | a4c2fec16f5e6a5fee4865e6e0e91e2bc2d10f37 (diff) | |
download | linux-6b27354cca8e9d9ab7c5bfb8a34101d52b5e48c4.tar.bz2 |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"An I2C core fix to prevent a use-after-free in a rare error path,
and an I2C ACPI addition to work around broken HW/firmware related
to touchscreens"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: core: fix use after free in of_i2c_notify
i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present
Diffstat (limited to 'drivers/net/slip/slip.c')
0 files changed, 0 insertions, 0 deletions