diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-06-22 16:11:09 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-06-22 16:11:09 +0400 |
| commit | f8a9503149c5c94d12d759ad7ef4b2f519a1751e (patch) | |
| tree | 557f87daf2b2a59d7bd3d6a909dc8f0cebb18fb0 /drivers/cpuidle/governors/menu.c | |
| parent | e1f931920a77a824321d38ffbc2d4f93aaf75871 (diff) | |
| parent | b286f1ce2b4a48ae25ee14b30c9da4da378fc5ad (diff) | |
Automatically merging tracking-thermal_exynos4_imx6 into merge-linux-linaro-core-tracking
Conflicting files:
Diffstat (limited to 'drivers/cpuidle/governors/menu.c')
0 files changed, 0 insertions, 0 deletions