| commit | 3c803e8e2f15d02c5ad0a3888eea2bbd31dc59c5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | Mon Jun 27 17:49:45 2005 -0700 |
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | Mon Jun 27 17:49:45 2005 -0700 |
| tree | f4c2e5316784cc670b95afee338e611e94e4252c | |
| parent | c47abbbffd17a7e774ec1ef952a1c3621a9cb13b [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.