Squashed update of kernel from 3.4.68 to 3.4.69
Revert "ALSA: fix oops in snd_pcm_info() caused by ASoC DPCM"

This reverts commit:
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=5812381adfde20cb352d3047190ab45ea5bb59f2
Merge branch 'cm-10.2' of https://github.com/Christopher83/samsung-kernel-msm7x30 into cm-11.0