From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 28 Jun 2005 00:49:45 +0000 (-0700)
Subject: Commit the manual part of the input layer merge.
X-Git-Tag: v2.6.13-rc1~46^2~83
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c803e8e2f15d02c5ad0a3888eea2bbd31dc59c5;p=pandora-kernel.git

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.
---

Reading git-diff-tree failed