Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers
authorTony Lindgren <tony@atomide.com>
Wed, 17 Oct 2012 18:21:34 +0000 (11:21 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 17 Oct 2012 18:21:34 +0000 (11:21 -0700)
commit6832c95599e1a04f4b56b533718d1cda4689aec2
tree3faf1a2a744245501c1743c909527d83bbb6666a
parent46cddc01aa6a017193ae7320ef8bfc8242782a66
parent3e6ece13d966a20a38ee7adfac452a47455ccd7a
Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers

Conflicts:
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/gpmc.c
drivers/media/platform/omap/omap_vout.c
drivers/media/platform/omap/omap_vout_vrfb.c
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/pm34xx.c
drivers/media/platform/omap/omap_vout.c
drivers/media/platform/omap/omap_vout_vrfb.c