aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorJiri Kosina <[email protected]>2017-11-15 10:10:38 +0000
committerJiri Kosina <[email protected]>2017-11-15 10:10:38 +0000
commit6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23 (patch)
tree718281e0f03caaf45c3928fab322e60f7631a9bb /net/unix/af_unix.c
parentMerge branch 'for-4.15/sony' into for-linus (diff)
parentHID: cp2112: fix broken gpio_direction_input callback (diff)
downloadkernel-6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23.tar.gz
kernel-6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23.zip
Merge branch 'for-4.15/upstream' into for-linus
- cp2112: GPIO error handling and Kconfig fixes from Sébastien Szymanski - i2c-hid: fixup / quirk for Apollo-Lake based laptops, from Hans de Goede - Input/Core: add eraser tool support, from Ping Cheng - small assorted code fixes Signed-off-by: Jiri Kosina <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions