diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-14 12:25:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-14 12:25:07 +0200 |
| commit | f6f4bbc997ed23540d23ff3f073dd1ac091c6984 (patch) | |
| tree | 9148c4c99607822abc0a58c80d658a6e85990c8b /drivers/gpu/drm/imx/parallel-display.c | |
| parent | db06d759d6cf903aeda8c107fd3abd366dd80200 (diff) | |
| parent | ce53da02ebfbe93ec58dd6150b28b4606330ead5 (diff) | |
Merge branch 'x86/cpu' into x86/platform, to avoid conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/imx/parallel-display.c')
0 files changed, 0 insertions, 0 deletions