]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux.bkbits.net/linux-2.5
authorDeepak Saxena <dsaxena@plexity.net>
Fri, 13 Aug 2004 17:39:09 +0000 (10:39 -0700)
committerDeepak Saxena <dsaxena@plexity.net>
Fri, 13 Aug 2004 17:39:09 +0000 (10:39 -0700)
into plexity.net:/home/dsaxena/src/linux-2.5-bk

1  2 
drivers/parisc/superio.c

Simple merge