mirror of
https://github.com/hardkernel/linux.git
synced 2026-05-07 12:45:48 +09:00
We want the changes here, and we resolve the merge conflict that was happening in the nvec_kbd.c file. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>