提交 6010c4c6 编写于 作者: M Mark Brown

Merge branch 'for-3.1' into for-3.2

Conflicts:
	sound/soc/omap/mcpdm.c
	sound/soc/omap/mcpdm.h
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册