diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 18:21:34 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 18:21:34 (GMT) |
| commit | 6832c95599e1a04f4b56b533718d1cda4689aec2 (patch) | |
| tree | 3faf1a2a744245501c1743c909527d83bbb6666a /arch/arm/mach-omap1/board-innovator.c | |
| parent | 46cddc01aa6a017193ae7320ef8bfc8242782a66 (diff) | |
| parent | 3e6ece13d966a20a38ee7adfac452a47455ccd7a (diff) | |
| download | linux-fsl-qoriq-6832c95599e1a04f4b56b533718d1cda4689aec2.tar.xz | |
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
Diffstat (limited to 'arch/arm/mach-omap1/board-innovator.c')
0 files changed, 0 insertions, 0 deletions