Merge branch 'for-2.6.30' into for-2.6.31
Mark Brown [Tue, 14 Apr 2009 12:22:37 +0000 (13:22 +0100)]
1  2 
sound/soc/pxa/pxa-ssp.c

Simple merge