Merge branch 'pxa-ssp' into for-2.6.30