diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-18 13:06:49 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-18 13:06:49 +0800 |
| commit | 142e6be5c40648bebe5267c6470966b6ba8f0e8b (patch) | |
| tree | 1182e7b1b64285af880bb1084b61b39ef5246d7d /drivers/cpuidle/sysfs.c | |
| parent | 87449e82dffbc547b20ea133bf2d8fc767096e56 (diff) | |
| parent | 667ea3959654ae48ef303df13f2635fd07766cb4 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Conflicts:
arch/x86/syscalls/syscall_64.tbl
Diffstat (limited to 'drivers/cpuidle/sysfs.c')
0 files changed, 0 insertions, 0 deletions