Merge remote-tracking branch 'av-feat-tree/omap5_audio_video-3.8.y' into vayu_exp
authorArchit Taneja <archit@ti.com>
Thu, 30 May 2013 13:36:08 +0000 (19:06 +0530)
committerArchit Taneja <archit@ti.com>
Thu, 30 May 2013 13:36:08 +0000 (19:06 +0530)
commit505acac8788f2580a41ea1c23aefd03f66ba5828
tree124408f3f80df8459b66b6cbb5c9eece8c199893
parent1215e6de72cc5a4a6129652a9f87f13ce1c97401
parent3c79a8595efaf7f38c79eedda1146c9e8821fac0
Merge remote-tracking branch 'av-feat-tree/omap5_audio_video-3.8.y' into vayu_exp

Conflicts:
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5-uevm.dts
arch/arm/boot/dts/omap5.dtsi
arch/arm/configs/omap2plus_defconfig
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c

Signed-off-by: Archit Taneja <archit@ti.com>
13 files changed:
arch/arm/boot/dts/omap3-beagle-xm.dts
arch/arm/boot/dts/omap4-sdp.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5-uevm.dts
arch/arm/boot/dts/omap5.dtsi
arch/arm/boot/dts/twl4030.dtsi
arch/arm/configs/omap2plus_defconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.h