]> git.neil.brown.name Git - history.git/commitdiff
Merge http://linux.bkbits.net/linux-2.5
authorBen Collins <bcollins@debian.org>
Thu, 22 Jan 2004 12:09:22 +0000 (07:09 -0500)
committerBen Collins <bcollins@debian.org>
Thu, 22 Jan 2004 12:09:22 +0000 (07:09 -0500)
into debian.org:/usr/src/kernel/sparc-2.6

1  2 
arch/sparc64/Kconfig

Simple merge