Merge branch 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm
commite024f69de9bd5b2686019f2491b779044cf89707
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Apr 2011 22:44:29 +0000 (18 15:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Apr 2011 22:44:29 +0000 (18 15:44 -0700)
treeba0bd62ea40e54123911b01007895e5afc192033
parent96fd2d57b8252e16dfacf8941f7a74a6119197f5
parent893b66c39da812e7dd0d7b32aa0633e5d90d950c
Merge branch 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm

* 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
  msm: timer: fix missing return value
  msm: Remove extraneous ffa device check