diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-12-03 14:47:06 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-12-03 14:47:06 +0000 |
| commit | 33e2b40b8c9afdf18430ec298f78f149f6dd8522 (patch) | |
| tree | e974b1597271df7f442d13cce48b8d5b1e92c2d4 /drivers/gpu/drm/savage/savage_drv.h | |
| parent | 1610baae15515854a96027d353902588d94f6261 (diff) | |
| parent | fe7fc8b19e968391ac028b4145552b2b4ff4df0a (diff) | |
Merge branch 'lsk-3.18-armlt-scpi-thermal' into integration-lsk-3.18-armlt-android
Conflicts:
linaro/configs/vexpress64.conf
Diffstat (limited to 'drivers/gpu/drm/savage/savage_drv.h')
0 files changed, 0 insertions, 0 deletions