projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96fd2d5 893b66c)
Merge branch 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Apr 2011 22:44:29 +0000 (15:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Apr 2011 22:44:29 +0000 (15:44 -0700)
* 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
  msm: timer: fix missing return value
  msm: Remove extraneous ffa device check


Trivial merge