]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcd76c75f2c5a97eb2eb9634ea77f14e858cd32b9
tree3faf1a2a744245501c1743c909527d83bbb6666a
parentb36112c9c23bf29676cd8c62f739203f357024f5
parentdaee75b745773826eaa55bfa2bdcc5298dfeab3a
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