提交 86b1e829 编写于 作者: A Anton Vorontsov

Merge branch 'ab8500-from-Rajanikanth'

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