Merge branch 'imx' into devel
Conflicts: arch/arm/mm/Kconfig
Showing
- arch/arm/Kconfig 4 additions, 0 deletionsarch/arm/Kconfig
- arch/arm/Makefile 1 addition, 0 deletionsarch/arm/Makefile
- arch/arm/configs/imx27ads_defconfig 826 additions, 0 deletionsarch/arm/configs/imx27ads_defconfig
- arch/arm/configs/mx31ads_defconfig 839 additions, 0 deletionsarch/arm/configs/mx31ads_defconfig
- arch/arm/configs/mx31litekit_defconfig 1100 additions, 0 deletionsarch/arm/configs/mx31litekit_defconfig
- arch/arm/configs/pcm037_defconfig 748 additions, 0 deletionsarch/arm/configs/pcm037_defconfig
- arch/arm/configs/pcm038_defconfig 1008 additions, 0 deletionsarch/arm/configs/pcm038_defconfig
- arch/arm/mach-imx/Makefile 1 addition, 1 deletionarch/arm/mach-imx/Makefile
- arch/arm/mach-imx/clock.c 205 additions, 0 deletionsarch/arm/mach-imx/clock.c
- arch/arm/mach-imx/cpufreq.c 17 additions, 3 deletionsarch/arm/mach-imx/cpufreq.c
- arch/arm/mach-imx/generic.c 0 additions, 76 deletionsarch/arm/mach-imx/generic.c
- arch/arm/mach-imx/mx1ads.c 10 additions, 0 deletionsarch/arm/mach-imx/mx1ads.c
- arch/arm/mach-imx/time.c 17 additions, 6 deletionsarch/arm/mach-imx/time.c
- arch/arm/mach-mx2/Kconfig 39 additions, 0 deletionsarch/arm/mach-mx2/Kconfig
- arch/arm/mach-mx2/Makefile 14 additions, 0 deletionsarch/arm/mach-mx2/Makefile
- arch/arm/mach-mx2/Makefile.boot 3 additions, 0 deletionsarch/arm/mach-mx2/Makefile.boot
- arch/arm/mach-mx2/clock_imx27.c 1626 additions, 0 deletionsarch/arm/mach-mx2/clock_imx27.c
- arch/arm/mach-mx2/cpu_imx27.c 63 additions, 0 deletionsarch/arm/mach-mx2/cpu_imx27.c
- arch/arm/mach-mx2/crm_regs.h 273 additions, 0 deletionsarch/arm/mach-mx2/crm_regs.h
- arch/arm/mach-mx2/devices.c 231 additions, 0 deletionsarch/arm/mach-mx2/devices.c
Loading
Please register or sign in to comment