Merge branch 'for-2.6.30' into for-2.6.31

sound/soc/pxa/pxa-ssp.c

@@ -815,6 +815,7 @@ static int pxa_ssp_probe(struct platform_device *pdev,
 		goto err_priv;
 	}
 
+	priv->dai_fmt = (unsigned int) -1;
 	dai->private_data = priv;
 
 	return 0;