• Arnd Bergmann's avatar
    Merge branch 'next/fixes' into next/cleanup · 3e965b17
    Arnd Bergmann authored
    Conflicts:
    	arch/arm/mach-mxs/include/mach/gpio.h
    	arch/arm/plat-mxc/include/mach/gpio.h
    	drivers/video/omap/lcd_apollon.c
    	drivers/video/omap/lcd_ldp.c
    	drivers/video/omap/lcd_overo.c
    3e965b17
iomux-v3.h 4.66 KB