]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c47abbb) | patch
Commit the manual part of the input layer merge.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 00:49:45 +0000 (17:49 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 00:49:45 +0000 (17:49 -0700)
commit3c803e8e2f15d02c5ad0a3888eea2bbd31dc59c5
treef4c2e5316784cc670b95afee338e611e94e4252ctree | snapshot
parentc47abbbffd17a7e774ec1ef952a1c3621a9cb13bcommit | diff
Commit the manual part of the input layer merge.

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.
drivers/input/gameport/gameport.c diff | blob | history
drivers/input/serio/serio.c diff | blob | history
Linux 2.6 source tree