Merge branch 'audio' into merge

Conflicts:
	arch/arm/configs/omap2plus_defconfig
	arch/arm/mach-omap2/devices.c

Signed-off-by: Vincent Stehlé <v-stehle@ti.com>
Merge branch 'usb' into merge

Conflicts:
	arch/arm/boot/dts/omap5-evm.dts
	arch/arm/boot/dts/omap5-panda.dts
	arch/arm/boot/dts/omap5.dtsi
	arch/arm/mach-omap2/board-generic.c

Signed-off-by: Vincent Stehlé <v-stehle@ti.com>