]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b88c06 9c0b841)
Merge maxwell.earthlink.net:/usr/src/linus-2.5
authorJames Simmons <jsimmons@maxwell.earthlink.net>
Mon, 9 Dec 2002 00:37:31 +0000 (16:37 -0800)
committerJames Simmons <jsimmons@maxwell.earthlink.net>
Mon, 9 Dec 2002 00:37:31 +0000 (16:37 -0800)
into maxwell.earthlink.net:/usr/src/fbdev-2.5

1  2 
arch/ppc64/Kconfig patch | diff1 | diff2 | blob | history
arch/sparc64/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/ppc64/Kconfig
Simple merge
diff --cc arch/sparc64/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.