summaryrefslogtreecommitdiff
path: root/fs/ocfs2/cluster/heartbeat.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-20 15:40:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-20 15:40:10 -0700
commit646da63172f660ba84f195c1165360a9b73583ee (patch)
treeb4abb491c2f95407845e9fbb7021c83e7b4368f7 /fs/ocfs2/cluster/heartbeat.c
parent8f49309a261dbe9b5217908e0e8ee8da7f148695 (diff)
parent315491e5d6ee66838a18a8ca0c14e6ffb376e48c (diff)
Merge tag 'remoteproc-4.1-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
Pull remoteproc update from Ohad Ben-Cohen: "Suman Anna is adding remoteproc support for processors not behind IOMMUs" * tag 'remoteproc-4.1-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc: remoteproc: add IOMMU hardware capability flag
Diffstat (limited to 'fs/ocfs2/cluster/heartbeat.c')
0 files changed, 0 insertions, 0 deletions