diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-07-25 10:55:46 +0200 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-07-25 10:55:46 +0200 |
| commit | d9053b487965042b9c849ce40c7f1fb7a0b84b39 (patch) | |
| tree | 1fbb2559dd8fd400cf1dff5711cc5e408ea79ef6 /include/trace | |
| parent | Merge branch 'for-next' of git://linuxtv.org/pinchartl/fbdev into fbdev-next (diff) | |
| parent | Merge "Apply LCD manager related parameters" from Archit (diff) | |
| download | linux-d9053b487965042b9c849ce40c7f1fb7a0b84b39.tar.xz linux-d9053b487965042b9c849ce40c7f1fb7a0b84b39.zip | |
Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next
Conflicts:
drivers/video/omap2/dss/core.c
drivers/video/omap2/dss/dispc.c
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions