提交 74d2b7a3 编写于 作者: M Mark Brown

Merge branch 'for-2.6.37' into for-2.6.38

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