Merge branch 'for-2.6.26' of git://git.farnsworth.org/dale/linux-2.6-mv643xx_eth...
commit54c852a2d61bb15d9b979410c2260edfb23d448c
authorJeff Garzik <jeff@garzik.org>
Tue, 6 May 2008 16:22:03 +0000 (6 12:22 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 6 May 2008 16:22:03 +0000 (6 12:22 -0400)
tree7a6ba9d1743b01090b85611cea9dd79ec2950487
parent7ab267d4ecdad3032d6bb31619a2744fc2074b59
parentce4e2e4558903ef92edf1ab4e09b0b338a09fd61
Merge branch 'for-2.6.26' of git://git.farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream
arch/arm/mach-orion5x/common.c