• Linus Torvalds's avatar
    Commit the manual part of the input layer merge. · 3c803e8e
    Linus Torvalds authored
    git did actually warn me about the fact that I hadn't actually done an
    "update-cache" on these two files, but the warning was at the bottom of
    a list of all the files that _did_ change in the merge, so I never
    noticed.  My bad.
    3c803e8e
serio.c 21.4 KB