Skip to content
Commit 041387d9 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)

parents 56f03563 b05948d9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment