diff options
| author |   Tony Lindgren <tony@atomide.com> | 2012-10-17 11:21:34 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 11:21:34 -0700 |
| commit | 6832c95599e1a04f4b56b533718d1cda4689aec2 (patch) | |
| tree | 3faf1a2a744245501c1743c909527d83bbb6666a /drivers/video/omap/lcd_inn1510.c | |
| parent | Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers (diff) | |
| parent | ARM: OMAP: move plat-omap/include/plat/sdrc.h into mach-omap2/sdrc.h (diff) | |
| download | linux-dev-6832c95599e1a04f4b56b533718d1cda4689aec2.tar.xz linux-dev-6832c95599e1a04f4b56b533718d1cda4689aec2.zip | |
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 'drivers/video/omap/lcd_inn1510.c')
0 files changed, 0 insertions, 0 deletions