summaryrefslogtreecommitdiff
path: root/kernel/futex.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-08-09 23:21:28 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-08-09 23:21:28 +0300
commit358f8c26b15daf16859cb3bd33db7e601707200e (patch)
tree9ce40690da91c21794592a02387039c35032622c /kernel/futex.c
parent31cf92f3dda8ecf4ce19761847cad6e1ffa144e1 (diff)
parent9c80034921d1ece5c0e3241ba1645bce32387684 (diff)
downloadlinux-358f8c26b15daf16859cb3bd33db7e601707200e.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: "The main thing is to allow empty id_tables for ACPI to make some drivers get probed again. It looks a bit bigger than usual because it needs some internal renaming, too. Other than that, there is a fix for broken DSTDs, a super simple enablement for ARM MPS, and two documentation fixes which I'd like to see in v4.13 already" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: rephrase explanation of I2C_CLASS_DEPRECATED i2c: allow i2c-versatile for ARM MPS platforms i2c: designware: Some broken DSTDs use 1MiHz instead of 1MHz i2c: designware: Print clock freq on invalid clock freq error i2c: core: Allow empty id_table in ACPI case as well i2c: mux: pinctrl: mention correct module name in Kconfig help text
Diffstat (limited to 'kernel/futex.c')
0 files changed, 0 insertions, 0 deletions