Merge branch 'for-next' into for-linus
Liam Girdwood [Mon, 1 Aug 2011 17:25:06 +0000 (18:25 +0100)]
1  2 
sound/soc/codecs/tlv320aic3x.c

Simple merge