Merge branch 'smc91x' into pxa-viper