]> git.hungrycats.org Git - linux/commitdiff
Merge plexity.net:/home/dsaxena/src/linux-2.6-ixp2000
authorDeepak Saxena <dsaxena@plexity.net>
Fri, 10 Sep 2004 07:23:28 +0000 (00:23 -0700)
committerDeepak Saxena <dsaxena@plexity.net>
Fri, 10 Sep 2004 07:23:28 +0000 (00:23 -0700)
into plexity.net:/home/dsaxena/src/linux-2.6-for-rmk

1  2 
arch/arm/mach-ixp2000/ixdp2x01.c

Simple merge