]> git.hungrycats.org Git - linux/commitdiff
Merge mulgrave.(none):/home/jejb/BK/linux-2.5
authorJames Bottomley <jejb@mulgrave.(none)>
Sun, 17 Nov 2002 11:52:56 +0000 (05:52 -0600)
committerJames Bottomley <jejb@mulgrave.(none)>
Sun, 17 Nov 2002 11:52:56 +0000 (05:52 -0600)
into mulgrave.(none):/home/jejb/BK/scsi-for-linus-2.5

1  2 
arch/arm/Kconfig

Simple merge