Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp
Conflicts: arch/arm/mach-tegra/Makefile
Showing
arch/arm/mach-tegra/apbio.c
0 → 100644
arch/arm/mach-tegra/apbio.h
0 → 100644
arch/arm/mach-tegra/pmc.c
0 → 100644
arch/arm/mach-tegra/pmc.h
0 → 100644
想要评论请 注册 或 登录