diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-11 16:57:46 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-11 16:57:46 +0800 |
| commit | f2725fa609772c64440e3fbd48209a0646e29035 (patch) | |
| tree | 5f01e83b532832f6c93f1b30eafe883203669d32 /drivers/clocksource/sun4i_timer.c | |
| parent | 1fb5d8682a8f0dcd28bd4dbaba646017c1fc3042 (diff) | |
| parent | 98fb754c57ea86c1ea5f18a82568f620d748c1bc (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rt
Conflicts:
drivers/gpu/drm/i915/i915_gem_shrinker.c
Diffstat (limited to 'drivers/clocksource/sun4i_timer.c')
0 files changed, 0 insertions, 0 deletions