linux backport 3.2-rc7 credit to imoseyon

Conflicts:
	sound/soc/omap/omap-mcbsp.c