]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux.bkbits.net/linux-2.5
authorDeepak Saxena <dsaxena@plexity.net>
Mon, 9 Aug 2004 07:14:39 +0000 (00:14 -0700)
committerDeepak Saxena <dsaxena@plexity.net>
Mon, 9 Aug 2004 07:14:39 +0000 (00:14 -0700)
into plexity.net:/home/dsaxena/src/linux-2.5-bk

1  2 
arch/ppc64/kernel/pSeries_pci.c

Simple merge