git.openwrt.org Git - openwrt/staging/blogic.git/commit

Merge branch 'omap/headers4' into next/dt

These changes are needed for the following omap DT changes

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

John Crispins staging tree

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clock33xx_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pm34xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/serial.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/include/dspbridge/host_os.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_dsps.c	diff1 \|	diff2 \|	blob \| history