]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66b3836 e7a1f24)
Merge maxwell.earthlink.net:/usr/src/linus-2.5
authorJames Simmons <jsimmons@maxwell.earthlink.net>
Sat, 7 Dec 2002 11:24:53 +0000 (03:24 -0800)
committerJames Simmons <jsimmons@maxwell.earthlink.net>
Sat, 7 Dec 2002 11:24:53 +0000 (03:24 -0800)
into maxwell.earthlink.net:/usr/src/fbdev-2.5

1  2 
arch/i386/Kconfig patch | diff1 | diff2 | blob | history
drivers/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/i386/Kconfig
Simple merge
diff --cc drivers/Makefile
Simple merge
Linux kernels and configurations used by Zygo.