diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-09-09 22:50:22 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-09-09 22:50:22 +0800 |
| commit | b71d24fd9283d80a2ca7b26cdd5de296b17de72c (patch) | |
| tree | df2f40632cc6fcb5229e6764b5ef8416786cfa4a /drivers/clocksource/sun4i_timer.c | |
| parent | f2725fa609772c64440e3fbd48209a0646e29035 (diff) | |
| parent | 57dad0b2f6693c01240772222c120516d5cd9d8a (diff) | |
Merge tag 'v4.1.31-rt35' into linux-linaro-lsk-v4.1-rt
Linux 4.1.31-rt35
Conflicts:
skip pagevec_add(pvec, page) in __lru_cache_add in mm/swap.c
Diffstat (limited to 'drivers/clocksource/sun4i_timer.c')
0 files changed, 0 insertions, 0 deletions