diff options
| author | Stephen Rothwell <[email protected]> | 2016-07-07 03:59:06 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-08-02 01:25:20 +0000 |
| commit | 77a87824ed676ca8ff8482e4157d3adb284fd381 (patch) | |
| tree | eca062e0d63648cfce1be4b6ae0257f3248bb28f /drivers/gpu/drm/omapdrm/omap_gem.c | |
| parent | Merge tag 'please-pull-misc-4.8' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | kernel-77a87824ed676ca8ff8482e4157d3adb284fd381.tar.gz kernel-77a87824ed676ca8ff8482e4157d3adb284fd381.zip | |
clocksource/drivers/clps_711x: fixup for "ARM: clps711x:
Switch to MULTIPLATFORM"
Missed conflict between commit c86f51737f8d ("ARM: clps711x: Switch to
MULTIPLATFORM") from the arm-soc tree and commit 250e46aa3bb3
("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") from the
clockevents tree.
Signed-off-by: Stephen Rothwell <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem.c')
0 files changed, 0 insertions, 0 deletions