]> git.hungrycats.org Git - linux/commitdiff
Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.config_sound
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Fri, 15 Mar 2002 17:04:34 +0000 (11:04 -0600)
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Fri, 15 Mar 2002 17:04:34 +0000 (11:04 -0600)
into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.config_sound.x

1  2 
arch/arm/Config.help
arch/i386/Config.help

Simple merge
Simple merge