We want the changes here, and we resolve the merge conflict that was
happening in the nvec_kbd.c file.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>