Merge branch 'features' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream