From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Apr 2011 22:44:29 +0000 (-0700)
Subject: Merge branch 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm
X-Git-Tag: v2.6.39-rc4~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e024f69de9bd5b2686019f2491b779044cf89707;p=~shefty%2Frdma-dev.git

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
---

e024f69de9bd5b2686019f2491b779044cf89707