• Arnd Bergmann's avatar
    Merge tag 'exynos-cleanup' of... · 9e0c42ea
    Arnd Bergmann authored
    Merge tag 'exynos-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup3
    
    Merge "Exynos cleanup for v3.15" from Kukjin Kim:
    
    - reorganize code for
    - add support reserve memory for mfc-v7
    - consolidate exynos4 and exynos5 machine codes
    - add generic compatible strings for exynos4 and exynos5
    - update DT with generic compatible strings
    - move clk related dt-binding header file in dt-bindings/clock
    
    * tag 'exynos-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock
      ARM: dts: Update Exynos DT files with generic compatible strings
      ARM: EXYNOS: Add generic compatible strings
      ARM: EXYNOS: Consolidate exynos4 and exynos5 machine files
      ARM: EXYNOS: Consolidate CPU init code
      ARM: SAMSUNG: Introduce generic Exynos4 and 5 helpers
      ARM: EXYNOS: Add support to reserve memory for MFC-v7
      ARM: SAMSUNG: Reorganize calls to reserve memory for MFC
    
    Conflicts:
    	arch/arm/mach-exynos/exynos.c
    
    Signed-off-by; Arnd Bergmann <arnd@arndb.de>
    9e0c42ea
Makefile 674 Bytes