fixed merging error of your merge with upstream kernel and system audio extension as before#3

codesnake merged 3 commits intocodesnake:amlogic-3.10.ycodesnake/linux:amlogic-3.10.yfrom

gdachs:cec-fixes1-with-user-controlgdachs/linux-codesnake:cec-fixes1-with-user-controlCopy head branch name to clipboard