Merge branch 'davinci' into for-2.6.32
Conflicts: sound/soc/davinci/davinci-i2s.c
Showing
sound/soc/davinci/davinci-mcasp.c
0 → 100644
sound/soc/davinci/davinci-mcasp.h
0 → 100644
想要评论请 注册 或 登录
Conflicts: sound/soc/davinci/davinci-i2s.c