• Linus Torvalds's avatar
    Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc · 7abec10c
    Linus Torvalds authored
    * 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc: (79 commits)
      ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung
      ARM: SAMSUNG: Cleanup resources by using macro
      ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h
      ARM: S5P: To merge devs.c files to one devs.c
      ARM: S3C64XX: To merge devs.c files to one devs.c
      ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c
      ARM: S5P64X0: Add Power Management support
      ARM: S5P: Make the sleep code common for S5P series SoCs
      ARM: S5P: Make the common S5P PM code conditionally compile
      ARM: SAMSUNG: Move S5P header files to plat-samsung
      ARM: SAMSUNG: Move S3C24XX header files to plat-samsung
      ARM: SAMSUNG: Moving each SoC support header files
      ARM: SAMSUNG: Consolidate plat/pll.h
      ARM: SAMSUNG: Consolidate plat/pwm-clock.h
      ARM: SAMSUNG: Cleanup mach/clkdev.h
      ARM: SAMSUNG: remove sdhci default configuration setup platform helper
      ARM: EXYNOS4: Add FIMC device on SMDKV310 board
      ARM: EXYNOS4: Add header file protection macros
      ARM: EXYNOS4: Add usb ehci device to the SMDKV310
      ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
      ...
    
    Fix up conflicts in
     - arch/arm/mach-exynos4/{Kconfig,clock.c}
    	ARM_CPU_SUSPEND, various random device tables (gah!)
     - drivers/gpio/Makefile
    	sa1100 gpio added, samsung gpio drivers merged
    7abec10c
Makefile 974 Bytes