diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-05-19 11:08:57 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-05-19 11:08:57 -0700 |
| commit | c3b6bd8051402400c26a16a753a71d311ceac50c (patch) | |
| tree | 8bfb6febb154bf7e6434b9be4bc0cbc2c3f0c91b /arch/arm64/boot/dts/Makefile | |
| parent | e650555fdbeb052afc2b22b1495344de1abb2ca7 (diff) | |
| parent | b072c492bc162877a83ebd067aa971cd3bc7ba5f (diff) | |
Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-v3.18-android
* 'android-3.18' of https://android.googlesource.com/kernel/common:
suspend: Return error when pending wakeup source is found.
proc: uid_cputime: fix show_uid_stat permission
Diffstat (limited to 'arch/arm64/boot/dts/Makefile')
0 files changed, 0 insertions, 0 deletions