Merge branch 'master' into fixes
Russell King [Fri, 13 Jan 2012 15:00:22 +0000 (15:00 +0000)]
1  2 
sound/soc/nuc900/nuc900-ac97.c

Simple merge