• Olof Johansson's avatar
    Merge branch 'next/dt' into HEAD · 7e95c548
    Olof Johansson authored
    Conflicts:
    	Documentation/devicetree/bindings/usb/platform-uhci.txt
    	arch/arm/mach-vt8500/bv07.c
    	arch/arm/mach-vt8500/devices-vt8500.c
    	arch/arm/mach-vt8500/devices-wm8505.c
    	arch/arm/mach-vt8500/devices.c
    	arch/arm/mach-vt8500/devices.h
    	arch/arm/mach-vt8500/wm8505_7in.c
    7e95c548
omap_hwmod.h 23.4 KB