Revert "Linux 3.4.69"

This reverts commit 8fcc4d21aeaa5407b1f30eb7bdc9d2b80340eff8.

Conflicts:
	sound/core/pcm.c