tree f4c2e5316784cc670b95afee338e611e94e4252c
parent c47abbbffd17a7e774ec1ef952a1c3621a9cb13b
author Linus Torvalds <torvalds@ppc970.osdl.org> 1119919785 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> 1119919785 -0700

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.