]> err.no Git - linux-2.6/commitdiff
Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 18 Oct 2005 21:16:06 +0000 (17:16 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 18 Oct 2005 21:16:06 +0000 (17:16 -0400)
1  2 
drivers/scsi/Kconfig

Simple merge