Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common...

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