Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. * tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM i.MX: Update defconfig ARM i.MX: Merge i.MX5 support into mach-imx ARM i.MX5: remove unnecessary includes from board files Fix up fairly trivial conflicts due to various changes nearby in arch/arm/{mach,plat}-imx/{Kconfig,Makefile} Pull request had been sent to the wrong email address, but happened before the merge window closed. I'm merging the MX 5 consolidation, since it apparently will help the next development window and will avoid conflicts later as per Arnd.
Showing
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
arch/arm/mach-mx5/Kconfig
已删除
100644 → 0
arch/arm/mach-mx5/Makefile
已删除
100644 → 0
arch/arm/mach-mx5/pm-imx5.c
已删除
100644 → 0
想要评论请 注册 或 登录