Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts: arch/arm/Kconfig
Showing
- arch/arm/Kconfig 8 additions, 6 deletionsarch/arm/Kconfig
- arch/arm/Makefile 1 addition, 2 deletionsarch/arm/Makefile
- arch/arm/configs/s3c2410_defconfig 321 additions, 317 deletionsarch/arm/configs/s3c2410_defconfig
- arch/arm/configs/s3c6400_defconfig 183 additions, 39 deletionsarch/arm/configs/s3c6400_defconfig
- arch/arm/configs/s5p6440_defconfig 43 additions, 17 deletionsarch/arm/configs/s5p6440_defconfig
- arch/arm/configs/s5p6442_defconfig 28 additions, 16 deletionsarch/arm/configs/s5p6442_defconfig
- arch/arm/configs/s5pc100_defconfig 1 addition, 1 deletionarch/arm/configs/s5pc100_defconfig
- arch/arm/configs/s5pc110_defconfig 18 additions, 6 deletionsarch/arm/configs/s5pc110_defconfig
- arch/arm/configs/s5pv210_defconfig 18 additions, 6 deletionsarch/arm/configs/s5pv210_defconfig
- arch/arm/mach-s3c2410/include/mach/map.h 1 addition, 0 deletionsarch/arm/mach-s3c2410/include/mach/map.h
- arch/arm/mach-s3c64xx/Kconfig 40 additions, 0 deletionsarch/arm/mach-s3c64xx/Kconfig
- arch/arm/mach-s3c64xx/Makefile 4 additions, 0 deletionsarch/arm/mach-s3c64xx/Makefile
- arch/arm/mach-s3c64xx/dev-onenand1.c 55 additions, 0 deletionsarch/arm/mach-s3c64xx/dev-onenand1.c
- arch/arm/mach-s3c64xx/include/mach/irqs.h 4 additions, 0 deletionsarch/arm/mach-s3c64xx/include/mach/irqs.h
- arch/arm/mach-s3c64xx/include/mach/map.h 14 additions, 0 deletionsarch/arm/mach-s3c64xx/include/mach/map.h
- arch/arm/mach-s3c64xx/mach-smartq.c 363 additions, 0 deletionsarch/arm/mach-s3c64xx/mach-smartq.c
- arch/arm/mach-s3c64xx/mach-smartq.h 20 additions, 0 deletionsarch/arm/mach-s3c64xx/mach-smartq.h
- arch/arm/mach-s3c64xx/mach-smartq5.c 185 additions, 0 deletionsarch/arm/mach-s3c64xx/mach-smartq5.c
- arch/arm/mach-s3c64xx/mach-smartq7.c 201 additions, 0 deletionsarch/arm/mach-s3c64xx/mach-smartq7.c
- arch/arm/mach-s3c64xx/mach-smdk6410.c 13 additions, 0 deletionsarch/arm/mach-s3c64xx/mach-smdk6410.c
Loading
Please register or sign in to comment