• Arnd Bergmann's avatar
    Merge branch 'depends/omap2_dss' into next/cleanup · 034ee299
    Arnd Bergmann authored
    Omap cleanups conflicted with omap2_dss work in a nontrivial
    way, this is the most logical fixup.
    
    Conflicts:
    	arch/arm/mach-omap2/board-2430sdp.c
    	arch/arm/mach-omap2/board-4430sdp.c
    	arch/arm/mach-omap2/board-apollon.c
    	arch/arm/mach-omap2/board-h4.c
    	arch/arm/mach-omap2/board-ldp.c
    	arch/arm/mach-omap2/board-rx51.c
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    034ee299
board-apollon.c 8.85 KB