Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm