• Olof Johansson's avatar
    Merge branch 'next/drivers' into HEAD · 8b1a13b0
    Olof Johansson authored
    Conflicts:
    	arch/arm/boot/dts/omap4.dtsi
    	arch/arm/mach-clps711x/common.c
    	arch/arm/mach-omap1/board-h2.c
    	arch/arm/mach-omap1/board-h3.c
    	arch/arm/mach-omap1/leds-h2p2-debug.c
    	arch/arm/mach-omap1/leds.c
    	arch/arm/mach-pnx4008/time.c
    	arch/arm/plat-omap/debug-leds.c
    	drivers/Makefile
    	drivers/bus/omap_l3_noc.c
    8b1a13b0
at91sam9260_devices.c 33.9 KB