Merge branch 'next-s5p' into for-next
Conflicts: arch/arm/mach-s5pv210/mach-aquila.c arch/arm/mach-s5pv210/mach-goni.c
Showing
arch/arm/plat-s5p/dev-pmu.c
0 → 100644
想要评论请 注册 或 登录
从无法访问的项目Fork
Conflicts: arch/arm/mach-s5pv210/mach-aquila.c arch/arm/mach-s5pv210/mach-goni.c