]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5aa43e bbfcdd7)
Merged a Makefile conflict.
authorJeff Dike <jdike@uml.karaya.com>
Sat, 16 Nov 2002 11:01:17 +0000 (06:01 -0500)
committerJeff Dike <jdike@uml.karaya.com>
Sat, 16 Nov 2002 11:01:17 +0000 (06:01 -0500)

Trivial merge
Linux kernels and configurations used by Zygo.